add dev and prod firebase option

disable_edit_user

android/app/build.gradle

@@ -1,5 +1,9 @@
 plugins {
     id "com.android.application"
+    // START: FlutterFire Configuration
+    id 'com.google.gms.google-services'
+    id 'com.google.firebase.crashlytics'
+    // END: FlutterFire Configuration
     id "kotlin-android"
     id "dev.flutter.flutter-gradle-plugin"
 }

android/app/google-services.json

@@ -0,0 +1,68 @@
+{
+  "project_info": {
+    "project_number": "427332280600",
+    "firebase_url": "https://test2-8a3d2-default-rtdb.firebaseio.com",
+    "project_id": "test2-8a3d2",
+    "storage_bucket": "test2-8a3d2.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:427332280600:android:550f67441246cb1a0c7e6d",
+        "android_client_info": {
+          "package_name": "com.example.syncrow.app"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:427332280600:android:bb6047adeeb80fb00c7e6d",
+        "android_client_info": {
+          "package_name": "com.example.syncrow_application"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:427332280600:android:2bc36fbe82994a3e0c7e6d",
+        "android_client_info": {
+          "package_name": "com.example.syncrow_web"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/settings.gradle

@@ -20,6 +20,10 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.0" apply false
+    // START: FlutterFire Configuration
+    id "com.google.gms.google-services" version "4.3.15" apply false
+    id "com.google.firebase.crashlytics" version "2.8.1" apply false
+    // END: FlutterFire Configuration
     id "org.jetbrains.kotlin.android" version "1.7.10" apply false
 }
 

firebase.json

@@ -0,0 +1 @@
+{"flutter":{"platforms":{"android":{"default":{"projectId":"test2-8a3d2","appId":"1:427332280600:android:2bc36fbe82994a3e0c7e6d","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"test2-8a3d2","appId":"1:427332280600:ios:14346b200780dc760c7e6d","uploadDebugSymbols":true,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"macos":{"default":{"projectId":"test2-8a3d2","appId":"1:427332280600:ios:14346b200780dc760c7e6d","uploadDebugSymbols":true,"fileOutput":"macos/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"test2-8a3d2","configurations":{"android":"1:427332280600:android:2bc36fbe82994a3e0c7e6d","ios":"1:427332280600:ios:14346b200780dc760c7e6d","macos":"1:427332280600:ios:14346b200780dc760c7e6d","web":"1:427332280600:web:ad50516a87a35a1a0c7e6d","windows":"1:427332280600:web:f7a25537ccd5a7bd0c7e6d"}}}}}}

ios/Runner.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		E44A9405B1EB1B638DD05A58 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7ABF0EC746A2D686A0ED574F /* Pods_RunnerTests.framework */; };
+		F2A3345EC3021060731668D3 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B14AB50E8716720E10D074BD /* GoogleService-Info.plist */; };
 		FF49F60EC38658783D8D66DA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AFAE479A87ECDEBD5D6EB30 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
@@ -64,6 +65,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		B14AB50E8716720E10D074BD /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		D3AD250AADBF93406007C9EB /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -138,6 +140,7 @@
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				1454C118FFCECEEDF59152D2 /* Pods */,
 				20A3C64D2B1CFED5A81C3251 /* Frameworks */,
+				B14AB50E8716720E10D074BD /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -199,6 +202,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				33590C9CD073D3D5EBA02CDE /* [CP] Embed Pods Frameworks */,
+				7A77858F6F15CB76D2D3A872 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
 			);
 			buildRules = (
 			);
@@ -264,6 +268,7 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+				F2A3345EC3021060731668D3 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -303,6 +308,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		7A77858F6F15CB76D2D3A872 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\"\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\" --platform=ios --apple-project-path=\"${SRCROOT}\" --env-platform-name=\"${PLATFORM_NAME}\" --env-configuration=\"${CONFIGURATION}\" --env-project-dir=\"${PROJECT_DIR}\" --env-built-products-dir=\"${BUILT_PRODUCTS_DIR}\" --env-dwarf-dsym-folder-path=\"${DWARF_DSYM_FOLDER_PATH}\" --env-dwarf-dsym-file-name=\"${DWARF_DSYM_FILE_NAME}\" --env-infoplist-path=\"${INFOPLIST_PATH}\" --default-config=default\n";
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;

ios/Runner/GoogleService-Info.plist

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw</string>
+	<key>GCM_SENDER_ID</key>
+	<string>427332280600</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.example.syncrowWeb</string>
+	<key>PROJECT_ID</key>
+	<string>test2-8a3d2</string>
+	<key>STORAGE_BUCKET</key>
+	<string>test2-8a3d2.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:427332280600:ios:14346b200780dc760c7e6d</string>
+	<key>DATABASE_URL</key>
+	<string>https://test2-8a3d2-default-rtdb.firebaseio.com</string>
+</dict>
+</plist>

lib/firebase_options_dev.dart

@@ -0,0 +1,93 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptionsDev {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      return web;
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        return macos;
+      case TargetPlatform.windows:
+        return windows;
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyCVEvKsJYzhWDFM-9Od68FE0nPpP933st0',
+    appId: '1:427332280600:web:ad50516a87a35a1a0c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    authDomain: 'test2-8a3d2.firebaseapp.com',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+    measurementId: 'G-Z1RTTTV5H9',
+  );
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyA5qOErxdm0zJmoHIB0TixfebYEsNRpwV0',
+    appId: '1:427332280600:android:2bc36fbe82994a3e0c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw',
+    appId: '1:427332280600:ios:14346b200780dc760c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+    iosBundleId: 'com.example.syncrowWeb',
+  );
+
+  static const FirebaseOptions macos = FirebaseOptions(
+    apiKey: 'AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw',
+    appId: '1:427332280600:ios:14346b200780dc760c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+    iosBundleId: 'com.example.syncrowWeb',
+  );
+
+  static const FirebaseOptions windows = FirebaseOptions(
+    apiKey: 'AIzaSyDizKjPC5rdkEjDxwXjM-RU5unB0Ziq3iw',
+    appId: '1:427332280600:web:f7a25537ccd5a7bd0c7e6d',
+    messagingSenderId: '427332280600',
+    projectId: 'test2-8a3d2',
+    authDomain: 'test2-8a3d2.firebaseapp.com',
+    databaseURL: 'https://test2-8a3d2-default-rtdb.firebaseio.com',
+    storageBucket: 'test2-8a3d2.firebasestorage.app',
+    measurementId: 'G-4LFVXEXWKY',
+  );
+}

lib/firebase_options_prod.dart

@@ -0,0 +1,77 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptionsStaging {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      return web;
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for macos - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.windows:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for windows - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyDP9GpYfLE8gHTj3kZ1hW8fx_FkJqOqSQk',
+    appId: '1:786692570726:android:0ef7079c2b978d4417b7a7',
+    messagingSenderId: '786692570726',
+    projectId: 'syncrow-staging',
+    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
+    storageBucket: 'syncrow-staging.appspot.com',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyAWlRiuJ75FMlf2_UDdri1voWKvkaSHtRg',
+    appId: '1:786692570726:ios:455a6fcff77e130f17b7a7',
+    messagingSenderId: '786692570726',
+    projectId: 'syncrow-staging',
+    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
+    storageBucket: 'syncrow-staging.appspot.com',
+    iosBundleId: 'com.example.syncrow.app',
+  );
+
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyDyGaQ3sZhb4meaY6sGke-YglhdhJ2is8Q',
+    appId: '1:786692570726:web:93c931e6701797b317b7a7',
+    messagingSenderId: '786692570726',
+    projectId: 'syncrow-staging',
+    authDomain: 'syncrow-staging.firebaseapp.com',
+    databaseURL: 'https://syncrow-staging-default-rtdb.firebaseio.com',
+    storageBucket: 'syncrow-staging.appspot.com',
+    measurementId: 'G-CZ3J3G6LMQ',
+  );
+}

lib/main.dart

@@ -1,8 +1,11 @@
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
+import 'package:syncrow_web/firebase_options_dev.dart';
+import 'package:syncrow_web/firebase_options_prod.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';
@@ -17,9 +20,13 @@ 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: 'production');
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
+    await Firebase.initializeApp(
+      options: DefaultFirebaseOptionsStaging.currentPlatform,
+    );
     initialSetup();
   } catch (_) {}
   runApp(MyApp());
@@ -49,7 +56,8 @@ 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(),
           ),

lib/main_dev.dart

@@ -0,0 +1,84 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:go_router/go_router.dart';
+import 'package:syncrow_web/firebase_options_dev.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/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';
+import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/theme/theme.dart';
+
+Future<void> main() async {
+  try {
+    const environment =
+        String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    await dotenv.load(fileName: '.env.$environment');
+    WidgetsFlutterBinding.ensureInitialized();
+    await Firebase.initializeApp(
+      options: DefaultFirebaseOptionsDev.currentPlatform,
+    );
+    initialSetup();
+  } catch (_) {}
+  runApp(MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  MyApp({
+    super.key,
+  });
+
+  final GoRouter _router = GoRouter(
+    initialLocation: RoutesConst.auth,
+    routes: AppRoutes.getRoutes(),
+    redirect: (context, state) async {
+      String checkToken = await AuthBloc.getTokenAndValidate();
+      final loggedIn = checkToken == 'Success';
+      final goingToLogin = state.uri.toString() == RoutesConst.auth;
+
+      if (!loggedIn && !goingToLogin) return RoutesConst.auth;
+      if (loggedIn && goingToLogin) return RoutesConst.home;
+
+      return null;
+    },
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiBlocProvider(
+        providers: [
+          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,
+          scrollBehavior: const MaterialScrollBehavior().copyWith(
+            dragDevices: {
+              PointerDeviceKind.mouse,
+              PointerDeviceKind.touch,
+              PointerDeviceKind.stylus,
+              PointerDeviceKind.unknown,
+            },
+          ),
+          theme: myTheme,
+          routerConfig: _router,
+        ));
+  }
+}

lib/pages/access_management/view/access_management.dart

@@ -17,6 +17,7 @@ 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';
 import 'package:syncrow_web/utils/style.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
@@ -27,19 +28,19 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
     final isLargeScreen = isLargeScreenSize(context);
     final isSmallScreen = isSmallScreenSize(context);
     final isHalfMediumScreen = isHafMediumScreenSize(context);
-    final padding = isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
+    final padding =
+        isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
 
     return WebScaffold(
         enableMenuSidebar: false,
-        appBarTitle: FittedBox(
-          child: Text(
-            'Access Management',
-            style: Theme.of(context).textTheme.headlineLarge,
-          ),
+        appBarTitle: Text(
+          'Access Management',
+          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
         ),
         rightBody: const NavigateHomeGridView(),
         scaffoldBody: BlocProvider(
-            create: (BuildContext context) => AccessBloc()..add(FetchTableData()),
+            create: (BuildContext context) =>
+                AccessBloc()..add(FetchTableData()),
             child: BlocConsumer<AccessBloc, AccessState>(
                 listener: (context, state) {},
                 builder: (context, state) {
@@ -93,11 +94,14 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                                   return [
                                     item.passwordName,
                                     item.passwordType.value,
-                                    accessBloc.timestampToDate(item.effectiveTime),
-                                    accessBloc.timestampToDate(item.invalidTime),
+                                    accessBloc
+                                        .timestampToDate(item.effectiveTime),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
                                     item.deviceName.toString(),
                                     item.authorizerEmail.toString(),
-                                    accessBloc.timestampToDate(item.invalidTime),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
                                     item.passwordStatus.value,
                                   ];
                                 }).toList(),
@@ -108,7 +112,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 })));
   }
 
-  Wrap _buildVisitorAdminPasswords(BuildContext context, AccessBloc accessBloc) {
+  Wrap _buildVisitorAdminPasswords(
+      BuildContext context, AccessBloc accessBloc) {
     return Wrap(
       spacing: 10,
       runSpacing: 10,
@@ -134,7 +139,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
               borderRadius: 8,
               child: Text(
                 'Create Visitor Password ',
-                style: context.textTheme.titleSmall!.copyWith(color: Colors.white, fontSize: 12),
+                style: context.textTheme.titleSmall!
+                    .copyWith(color: Colors.white, fontSize: 12),
               )),
         ),
         // Container(
@@ -172,8 +178,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
             description: '',
             onSubmitted: (value) {
               accessBloc.add(FilterDataEvent(
-                  emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                  emailAuthorizer:
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
                   passwordName: accessBloc.passwordName.text.toLowerCase(),
                   startTime: accessBloc.effectiveTimeTimeStamp,
                   endTime: accessBloc.expirationTimeTimeStamp));
@@ -191,8 +199,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
             description: '',
             onSubmitted: (value) {
               accessBloc.add(FilterDataEvent(
-                  emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                  selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                  emailAuthorizer:
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
                   passwordName: accessBloc.passwordName.text.toLowerCase(),
                   startTime: accessBloc.effectiveTimeTimeStamp,
                   endTime: accessBloc.expirationTimeTimeStamp));
@@ -221,7 +231,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
           onSearch: () {
             accessBloc.add(FilterDataEvent(
                 emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
                 passwordName: accessBloc.passwordName.text.toLowerCase(),
                 startTime: accessBloc.effectiveTimeTimeStamp,
                 endTime: accessBloc.expirationTimeTimeStamp));
@@ -249,8 +260,10 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
               description: '',
               onSubmitted: (value) {
                 accessBloc.add(FilterDataEvent(
-                    emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                    selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                    emailAuthorizer:
+                        accessBloc.emailAuthorizer.text.toLowerCase(),
+                    selectedTabIndex:
+                        BlocProvider.of<AccessBloc>(context).selectedIndex,
                     passwordName: accessBloc.passwordName.text.toLowerCase(),
                     startTime: accessBloc.effectiveTimeTimeStamp,
                     endTime: accessBloc.expirationTimeTimeStamp));
@@ -274,7 +287,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
           onSearch: () {
             accessBloc.add(FilterDataEvent(
                 emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex: BlocProvider.of<AccessBloc>(context).selectedIndex,
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
                 passwordName: accessBloc.passwordName.text.toLowerCase(),
                 startTime: accessBloc.effectiveTimeTimeStamp,
                 endTime: accessBloc.expirationTimeTimeStamp));

lib/pages/auth/view/forget_password_page.dart

@@ -8,6 +8,8 @@ class ForgetPasswordPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return const ResponsiveLayout(
-        desktopBody: ForgetPasswordWebPage(), mobileBody: ForgetPasswordWebPage());
+        tablet: ForgetPasswordWebPage(),
+        desktopBody: ForgetPasswordWebPage(),
+        mobileBody: ForgetPasswordWebPage());
   }
 }

lib/pages/auth/view/login_page.dart

@@ -9,6 +9,8 @@ class LoginPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return const ResponsiveLayout(
-        desktopBody: LoginWebPage(), mobileBody: LoginWebPage());
+        tablet: LoginWebPage(),
+        desktopBody: LoginWebPage(),
+        mobileBody: LoginWebPage());
   }
 }

lib/pages/device_managment/ac/bloc/ac_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
@@ -19,6 +20,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     on<AcControlEvent>(_onAcControl);
     on<AcBatchControlEvent>(_onAcBatchControl);
     on<AcFactoryResetEvent>(_onFactoryReset);
+    on<AcStatusUpdated>(_onAcStatusUpdated);
   }
 
   FutureOr<void> _onFetchAcStatus(
@@ -28,12 +30,64 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = AcStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(ACStatusLoaded(deviceStatus));
     } catch (e) {
       emit(AcsFailedState(error: e.toString()));
     }
   }
 
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) async {
+        if (event.snapshot.value == null) return;
+
+        if (_timer != null) {
+          await Future.delayed(const Duration(seconds: 1));
+        }
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            AcStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(AcStatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onAcStatusUpdated(AcStatusUpdated event, Emitter<AcsState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(ACStatusLoaded(deviceStatus));
+  }
+
+  // Future<void> testFirebaseConnection() async {
+  //   // Reference to a test node in your database
+  //   final testRef = FirebaseDatabase.instance.ref("test");
+
+  //   // Write a test value
+  //   await testRef.set("Hello, Firebase!");
+
+  //   // Listen for changes on the test node
+  //   testRef.onValue.listen((DatabaseEvent event) {
+  //     final data = event.snapshot.value;
+  //     print("Data from Firebase: $data");
+  //     // If you see "Hello, Firebase!" printed in your console, it means the connection works.
+  //   });
+  // }
+
   FutureOr<void> _onAcControl(
       AcControlEvent event, Emitter<AcsState> emit) async {
     final oldValue = _getValueByCode(event.code);

lib/pages/device_managment/ac/bloc/ac_event.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 
 sealed class AcsEvent extends Equatable {
@@ -7,6 +8,7 @@ sealed class AcsEvent extends Equatable {
   @override
   List<Object> get props => [];
 }
+class AcUpdated extends AcsEvent {}
 
 class AcFetchDeviceStatusEvent extends AcsEvent {
   final String deviceId;
@@ -16,7 +18,10 @@ class AcFetchDeviceStatusEvent extends AcsEvent {
   @override
   List<Object> get props => [deviceId];
 }
-
+class AcStatusUpdated extends AcsEvent {
+  final AcStatusModel deviceStatus;
+  AcStatusUpdated(this.deviceStatus);
+}
 class AcFetchBatchStatusEvent extends AcsEvent {
   final List<String> devicesIds;
 

lib/pages/device_managment/ac/view/ac_device_control.dart

@@ -24,7 +24,8 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => AcBloc(deviceId: device.uuid!)..add(AcFetchDeviceStatusEvent(device.uuid!)),
+      create: (context) => AcBloc(deviceId: device.uuid!)
+        ..add(AcFetchDeviceStatusEvent(device.uuid!)),
       child: BlocBuilder<AcBloc, AcsState>(
         builder: (context, state) {
           if (state is ACStatusLoaded) {
@@ -98,7 +99,8 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
                       ),
                       Text(
                         'h',
-                        style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor),
+                        style: context.textTheme.bodySmall!
+                            .copyWith(color: ColorsManager.blackColor),
                       ),
                       Text(
                         '30',
@@ -107,7 +109,9 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
                           fontWeight: FontWeight.bold,
                         ),
                       ),
-                      Text('m', style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor)),
+                      Text('m',
+                          style: context.textTheme.bodySmall!
+                              .copyWith(color: ColorsManager.blackColor)),
                       IconButton(
                         padding: const EdgeInsets.all(0),
                         onPressed: () {},

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

@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/routines/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';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
@@ -19,17 +20,17 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (context) => DeviceManagementBloc()..add(FetchDevices(context)),
+          create: (context) =>
+              DeviceManagementBloc()..add(FetchDevices(context)),
         ),
       ],
       child: WebScaffold(
-        appBarTitle: FittedBox(
-          child: Text(
-            'Device Management',
-            style: Theme.of(context).textTheme.headlineLarge,
-          ),
+        appBarTitle: Text(
+          'Device Management',
+          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
         ),
-        centerBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
+        centerBody:
+            BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
           return Row(
             mainAxisSize: MainAxisSize.min,
             children: [
@@ -45,8 +46,11 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 child: Text(
                   'Devices',
                   style: context.textTheme.titleMedium?.copyWith(
-                    color: !state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
-                    fontWeight: !state.routineTab ? FontWeight.w700 : FontWeight.w400,
+                    color: !state.routineTab
+                        ? ColorsManager.whiteColors
+                        : ColorsManager.grayColor,
+                    fontWeight:
+                        !state.routineTab ? FontWeight.w700 : FontWeight.w400,
                   ),
                 ),
               ),
@@ -55,13 +59,18 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   backgroundColor: null,
                 ),
                 onPressed: () {
-                  context.read<RoutineBloc>().add(const TriggerSwitchTabsEvent(isRoutineTab: true));
+                  context
+                      .read<RoutineBloc>()
+                      .add(const TriggerSwitchTabsEvent(isRoutineTab: true));
                 },
                 child: Text(
                   'Routines',
                   style: context.textTheme.titleMedium?.copyWith(
-                    color: state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
-                    fontWeight: state.routineTab ? FontWeight.w700 : FontWeight.w400,
+                    color: state.routineTab
+                        ? ColorsManager.whiteColors
+                        : ColorsManager.grayColor,
+                    fontWeight:
+                        state.routineTab ? FontWeight.w700 : FontWeight.w400,
                   ),
                 ),
               ),
@@ -69,7 +78,8 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
           );
         }),
         rightBody: const NavigateHomeGridView(),
-        scaffoldBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
+        scaffoldBody:
+            BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
           if (state.routineTab) {
             return const RoutinesView();
           }
@@ -84,7 +94,8 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
               } else if (deviceState is DeviceManagementLoaded) {
                 return DeviceManagementBody(devices: deviceState.devices);
               } else if (deviceState is DeviceManagementFiltered) {
-                return DeviceManagementBody(devices: deviceState.filteredDevices);
+                return DeviceManagementBody(
+                    devices: deviceState.filteredDevices);
               } else {
                 return const Center(child: Text('Error fetching Devices'));
               }

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/bloc/space_tree_bloc.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';
@@ -69,7 +68,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
               },
             )),
             Expanded(
-              flex: 3,
+              flex: 4,
               child: state is DeviceManagementLoading
                   ? const Center(child: CircularProgressIndicator())
                   : Column(
@@ -95,7 +94,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                               const DeviceSearchFilters(),
                               const SizedBox(height: 12),
                               Container(
-                                height: 45,
+                                // height: 45,
                                 width: 125,
                                 decoration: containerDecoration,
                                 child: Center(

lib/pages/device_managment/ceiling_sensor/bloc/ceiling_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/ceiling_sensor/bloc/ceiling_event.dart';
@@ -22,42 +23,55 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     on<ShowCeilingDescriptionEvent>(_showDescription);
     on<BackToCeilingGridViewEvent>(_backToGridView);
     on<CeilingFactoryResetEvent>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   void _fetchCeilingSensorStatus(
       CeilingInitialEvent event, Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingInitialState());
     try {
-      var response = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      var response =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = CeilingSensorModel.fromJson(response.status);
       emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges(event.deviceId);
     } catch (e) {
       emit(CeilingFailedState(error: e.toString()));
       return;
     }
   }
 
-  // _listenToChanges() {
-  //   try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     stream.listen((DatabaseEvent event) {
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
 
-  //       usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-  //       });
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
 
-  //       deviceStatus = WallSensorModel.fromJson(statusList);
-  //       add(WallSensorUpdatedEvent());
-  //     });
-  //   } catch (_) {}
-  // }
+        deviceStatus = CeilingSensorModel.fromJson(statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
 
-  void _changeValue(CeilingChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
+  void _onStatusUpdated(StatusUpdated event, Emitter<CeilingSensorState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
+  }
+
+  void _changeValue(
+      CeilingChangeValueEvent event, Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingNewSate(ceilingSensorModel: deviceStatus));
     if (event.code == 'sensitivity') {
       deviceStatus.sensitivity = event.value;
@@ -122,7 +136,8 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
         } else {
           response = await DevicesManagementApi()
               .deviceControl(deviceId, Status(code: code, value: value));
@@ -143,8 +158,8 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     });
   }
 
-  FutureOr<void> _getDeviceReports(
-      GetCeilingDeviceReportsEvent event, Emitter<CeilingSensorState> emit) async {
+  FutureOr<void> _getDeviceReports(GetCeilingDeviceReportsEvent event,
+      Emitter<CeilingSensorState> emit) async {
     if (event.code.isEmpty) {
       emit(ShowCeilingDescriptionState(description: reportString));
       return;
@@ -155,7 +170,8 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
 
       try {
         // await DevicesManagementApi.getDeviceReportsByDate(deviceId, event.code, from.toString(), to.toString())
-        await DevicesManagementApi.getDeviceReports(deviceId, event.code).then((value) {
+        await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+            .then((value) {
           emit(CeilingReportsState(deviceReport: value));
         });
       } catch (e) {
@@ -165,19 +181,23 @@ class CeilingSensorBloc extends Bloc<CeilingSensorEvent, CeilingSensorState> {
     }
   }
 
-  void _showDescription(ShowCeilingDescriptionEvent event, Emitter<CeilingSensorState> emit) {
+  void _showDescription(
+      ShowCeilingDescriptionEvent event, Emitter<CeilingSensorState> emit) {
     emit(ShowCeilingDescriptionState(description: event.description));
   }
 
-  void _backToGridView(BackToCeilingGridViewEvent event, Emitter<CeilingSensorState> emit) {
+  void _backToGridView(
+      BackToCeilingGridViewEvent event, Emitter<CeilingSensorState> emit) {
     emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
   }
 
   FutureOr<void> _fetchCeilingSensorBatchControl(
-      CeilingFetchDeviceStatusEvent event, Emitter<CeilingSensorState> emit) async {
+      CeilingFetchDeviceStatusEvent event,
+      Emitter<CeilingSensorState> emit) async {
     emit(CeilingLoadingInitialState());
     try {
-      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      var response =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = CeilingSensorModel.fromJson(response.status);
       emit(CeilingUpdateState(ceilingSensorModel: deviceStatus));
     } catch (e) {

lib/pages/device_managment/ceiling_sensor/bloc/ceiling_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/ceiling_sensor/model/ceiling_sensor_model.dart';
 
 abstract class CeilingSensorEvent extends Equatable {
   const CeilingSensorEvent();
@@ -83,3 +84,12 @@ class CeilingFactoryResetEvent extends CeilingSensorEvent {
   @override
   List<Object> get props => [devicesId, factoryResetModel];
 }
+
+
+
+class StatusUpdated extends CeilingSensorEvent {
+  final CeilingSensorModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/curtain/bloc/curtain_bloc.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/curtain/bloc/curtain_event.dart';
@@ -16,6 +17,7 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     on<CurtainControl>(_onCurtainControl);
     on<CurtainBatchControl>(_onCurtainBatchControl);
     on<CurtainFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   FutureOr<void> _onFetchDeviceStatus(
@@ -24,7 +26,7 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     try {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
-
+      _listenToChanges(event.deviceId);
       deviceStatus = _checkStatus(status.status[0].value);
 
       emit(CurtainStatusLoaded(deviceStatus));
@@ -33,6 +35,48 @@ class CurtainBloc extends Bloc<CurtainEvent, CurtainState> {
     }
   }
 
+  void _listenToChanges(String deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        final data = event.snapshot.value as Map<dynamic, dynamic>?;
+        if (data == null) return;
+
+        List<Status> statusList = [];
+        if (data['status'] != null) {
+          for (var element in data['status']) {
+            statusList.add(
+              Status(
+                code: element['code'].toString(),
+                value: element['value'].toString(),
+              ),
+            );
+          }
+        }
+        if (statusList.isNotEmpty) {
+          bool newStatus = _checkStatus(statusList[0].value);
+          if (newStatus != deviceStatus) {
+            deviceStatus = newStatus;
+            if (!isClosed) {
+              add(StatusUpdated(deviceStatus));
+            }
+          }
+        }
+      });
+    } catch (e) {
+      emit(CurtainError('Failed to listen to changes: $e'));
+    }
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<CurtainState> emit) {
+    emit(CurtainStatusLoading());
+    deviceStatus = event.deviceStatus;
+    emit(CurtainStatusLoaded(deviceStatus));
+  }
+
   FutureOr<void> _onCurtainControl(
       CurtainControl event, Emitter<CurtainState> emit) async {
     final oldValue = deviceStatus;

lib/pages/device_managment/curtain/bloc/curtain_event.dart

@@ -60,3 +60,7 @@ class CurtainFactoryReset extends CurtainEvent {
   @override
   List<Object> get props => [deviceId, factoryReset];
 }
+class StatusUpdated extends CurtainEvent {
+  final bool deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+}

lib/pages/device_managment/door_lock/bloc/door_lock_bloc.dart

@@ -1,6 +1,7 @@
 // ignore_for_file: invalid_use_of_visible_for_testing_member
 
 import 'dart:async';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/bloc/door_lock_event.dart';
@@ -18,6 +19,39 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
     //on<DoorLockControl>(_onDoorLockControl);
     on<UpdateLockEvent>(_updateLock);
     on<DoorLockFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
+  }
+
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            DoorLockStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<DoorLockState> emit) {
+    emit(DoorLockStatusLoading());
+
+    deviceStatus = event.deviceStatus;
+    emit(DoorLockStatusLoaded(deviceStatus));
   }
 
   FutureOr<void> _onFetchDeviceStatus(
@@ -28,6 +62,8 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus =
           DoorLockStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
+
       emit(DoorLockStatusLoaded(deviceStatus));
     } catch (e) {
       emit(DoorLockControlError(e.toString()));

lib/pages/device_managment/door_lock/bloc/door_lock_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/door_lock/models/door_lock_status_model.dart';
 
 sealed class DoorLockEvent extends Equatable {
   const DoorLockEvent();
@@ -51,3 +52,10 @@ class DoorLockFactoryReset extends DoorLockEvent {
   @override
   List<Object> get props => [deviceId, factoryReset];
 }
+
+class StatusUpdated extends DoorLockEvent {
+  final DoorLockStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_reports.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_event.dart';
@@ -39,31 +40,68 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     on<GarageDoorFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<GarageDoorFactoryResetEvent>(_onFactoryReset);
     on<EditGarageDoorScheduleEvent>(_onEditSchedule);
+    on<StatusUpdated>(_onStatusUpdated);
+  }
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            GarageDoorStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
   }
 
-  void _fetchGarageDoorStatus(GarageDoorInitialEvent event, Emitter<GarageDoorState> emit) async {
+  void _onStatusUpdated(StatusUpdated event, Emitter<GarageDoorState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(GarageDoorLoadedState(status: deviceStatus));
+  }
+
+  void _fetchGarageDoorStatus(
+      GarageDoorInitialEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      var response = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      var response =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = GarageDoorStatusModel.fromJson(deviceId, response.status);
+      _listenToChanges(deviceId);
       emit(GarageDoorLoadedState(status: deviceStatus));
     } catch (e) {
       emit(GarageDoorErrorState(message: e.toString()));
     }
   }
 
-  Future<void> _onFetchBatchStatus(GarageDoorFetchBatchStatusEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _onFetchBatchStatus(GarageDoorFetchBatchStatusEvent event,
+      Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-      deviceStatus = GarageDoorStatusModel.fromJson(event.deviceIds.first, status.status);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus =
+          GarageDoorStatusModel.fromJson(event.deviceIds.first, status.status);
       emit(GarageDoorBatchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(GarageDoorBatchControlError(e.toString()));
     }
   }
 
-  Future<void> _addSchedule(AddGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _addSchedule(
+      AddGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
     try {
       ScheduleEntry newSchedule = ScheduleEntry(
         category: event.category,
@@ -71,9 +109,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         function: Status(code: 'switch_1', value: event.functionOn),
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
-      bool success = await DevicesManagementApi().addScheduleRecord(newSchedule, deviceId);
+      bool success =
+          await DevicesManagementApi().addScheduleRecord(newSchedule, deviceId);
       if (success) {
-        add(FetchGarageDoorSchedulesEvent(deviceId: deviceId, category: 'switch_1'));
+        add(FetchGarageDoorSchedulesEvent(
+            deviceId: deviceId, category: 'switch_1'));
       } else {
         emit(GarageDoorLoadedState(status: deviceStatus));
       }
@@ -82,16 +122,19 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _onUpdateCountdownAlarm(UpdateCountdownAlarmEvent event, Emitter<GarageDoorState> emit) {
+  void _onUpdateCountdownAlarm(
+      UpdateCountdownAlarmEvent event, Emitter<GarageDoorState> emit) {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
-        status: currentState.status.copyWith(countdownAlarm: event.countdownAlarm),
+        status:
+            currentState.status.copyWith(countdownAlarm: event.countdownAlarm),
       ));
     }
   }
 
-  void _onUpdateTrTimeCon(UpdateTrTimeConEvent event, Emitter<GarageDoorState> emit) {
+  void _onUpdateTrTimeCon(
+      UpdateTrTimeConEvent event, Emitter<GarageDoorState> emit) {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
@@ -100,7 +143,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _updateSchedule(UpdateGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _updateSchedule(UpdateGarageDoorScheduleEvent event,
+      Emitter<GarageDoorState> emit) async {
     try {
       final updatedSchedules = deviceStatus.schedules?.map((schedule) {
         if (schedule.scheduleId == event.scheduleId) {
@@ -127,12 +171,15 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _deleteSchedule(DeleteGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _deleteSchedule(DeleteGarageDoorScheduleEvent event,
+      Emitter<GarageDoorState> emit) async {
     try {
-      bool success = await DevicesManagementApi().deleteScheduleRecord(deviceStatus.uuid, event.scheduleId);
+      bool success = await DevicesManagementApi()
+          .deleteScheduleRecord(deviceStatus.uuid, event.scheduleId);
       if (success) {
-        final updatedSchedules =
-            deviceStatus.schedules?.where((schedule) => schedule.scheduleId != event.scheduleId).toList();
+        final updatedSchedules = deviceStatus.schedules
+            ?.where((schedule) => schedule.scheduleId != event.scheduleId)
+            .toList();
         deviceStatus = deviceStatus.copyWith(schedules: updatedSchedules);
         emit(GarageDoorLoadedState(status: deviceStatus));
       } else {
@@ -143,11 +190,12 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _fetchSchedules(FetchGarageDoorSchedulesEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _fetchSchedules(FetchGarageDoorSchedulesEvent event,
+      Emitter<GarageDoorState> emit) async {
     emit(ScheduleGarageLoadingState());
     try {
-      List<ScheduleModel> schedules =
-          await DevicesManagementApi().getDeviceSchedules(deviceStatus.uuid, event.category);
+      List<ScheduleModel> schedules = await DevicesManagementApi()
+          .getDeviceSchedules(deviceStatus.uuid, event.category);
       deviceStatus = deviceStatus.copyWith(schedules: schedules);
       emit(
         GarageDoorLoadedState(
@@ -165,30 +213,37 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _updateSelectedTime(UpdateSelectedTimeEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _updateSelectedTime(
+      UpdateSelectedTimeEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(selectedTime: event.selectedTime));
     }
   }
 
-  Future<void> _updateSelectedDay(UpdateSelectedDayEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _updateSelectedDay(
+      UpdateSelectedDayEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       List<bool> updatedDays = List.from(currentState.selectedDays);
       updatedDays[event.dayIndex] = event.isSelected;
-      emit(currentState.copyWith(selectedDays: updatedDays, selectedTime: currentState.selectedTime));
+      emit(currentState.copyWith(
+          selectedDays: updatedDays, selectedTime: currentState.selectedTime));
     }
   }
 
-  Future<void> _updateFunctionOn(UpdateFunctionOnEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _updateFunctionOn(
+      UpdateFunctionOnEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
-      emit(currentState.copyWith(functionOn: event.functionOn, selectedTime: currentState.selectedTime));
+      emit(currentState.copyWith(
+          functionOn: event.functionOn,
+          selectedTime: currentState.selectedTime));
     }
   }
 
-  Future<void> _initializeAddSchedule(InitializeAddScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _initializeAddSchedule(
+      InitializeAddScheduleEvent event, Emitter<GarageDoorState> emit) async {
     final currentState = state;
     if (currentState is GarageDoorLoadedState) {
       emit(currentState.copyWith(
@@ -200,20 +255,25 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _fetchRecords(FetchGarageDoorRecordsEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _fetchRecords(
+      FetchGarageDoorRecordsEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorReportsLoadingState());
     try {
-      final from = DateTime.now().subtract(const Duration(days: 30)).millisecondsSinceEpoch;
+      final from = DateTime.now()
+          .subtract(const Duration(days: 30))
+          .millisecondsSinceEpoch;
       final to = DateTime.now().millisecondsSinceEpoch;
       final DeviceReport records =
-          await DevicesManagementApi.getDeviceReportsByDate(event.deviceId, 'switch_1', from.toString(), to.toString());
+          await DevicesManagementApi.getDeviceReportsByDate(
+              event.deviceId, 'switch_1', from.toString(), to.toString());
       emit(GarageDoorReportsState(deviceReport: records));
     } catch (e) {
       emit(GarageDoorReportsFailedState(error: e.toString()));
     }
   }
 
-  Future<void> _onBatchControl(GarageDoorBatchControlEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _onBatchControl(
+      GarageDoorBatchControlEvent event, Emitter<GarageDoorState> emit) async {
     final oldValue = event.code == 'switch_1' ? deviceStatus.switch1 : false;
 
     _updateLocalValue(event.code, event.value);
@@ -233,11 +293,13 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _backToGridView(BackToGarageDoorGridViewEvent event, Emitter<GarageDoorState> emit) {
+  void _backToGridView(
+      BackToGarageDoorGridViewEvent event, Emitter<GarageDoorState> emit) {
     emit(GarageDoorLoadedState(status: deviceStatus));
   }
 
-  void _handleUpdate(GarageDoorUpdatedEvent event, Emitter<GarageDoorState> emit) {
+  void _handleUpdate(
+      GarageDoorUpdatedEvent event, Emitter<GarageDoorState> emit) {
     emit(GarageDoorLoadedState(status: deviceStatus));
   }
 
@@ -253,9 +315,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
       late bool status;
       await Future.delayed(const Duration(milliseconds: 500));
       if (isBatch) {
-        status = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+        status = await DevicesManagementApi()
+            .deviceBatchControl(deviceId, code, value);
       } else {
-        status = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
+        status = await DevicesManagementApi()
+            .deviceControl(deviceId, Status(code: code, value: value));
       }
 
       if (!status) {
@@ -270,10 +334,12 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  Future<void> _onFactoryReset(GarageDoorFactoryResetEvent event, Emitter<GarageDoorState> emit) async {
+  Future<void> _onFactoryReset(
+      GarageDoorFactoryResetEvent event, Emitter<GarageDoorState> emit) async {
     emit(GarageDoorLoadingState());
     try {
-      final response = await DevicesManagementApi().factoryReset(event.factoryReset, event.deviceId);
+      final response = await DevicesManagementApi()
+          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
         emit(const GarageDoorErrorState(message: 'Failed to reset device'));
       } else {
@@ -284,34 +350,47 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _increaseDelay(IncreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
+  void _increaseDelay(
+      IncreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
     // if (deviceStatus.countdown1 != 0) {
     try {
-      deviceStatus = deviceStatus.copyWith(delay: deviceStatus.delay + Duration(minutes: 10));
+      deviceStatus = deviceStatus.copyWith(
+          delay: deviceStatus.delay + Duration(minutes: 10));
       emit(GarageDoorLoadedState(status: deviceStatus));
-      add(GarageDoorControlEvent(deviceId: event.deviceId, value: deviceStatus.delay.inSeconds, code: 'countdown_1'));
+      add(GarageDoorControlEvent(
+          deviceId: event.deviceId,
+          value: deviceStatus.delay.inSeconds,
+          code: 'countdown_1'));
     } catch (e) {
       emit(GarageDoorErrorState(message: e.toString()));
     }
     // }
   }
 
-  void _decreaseDelay(DecreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
+  void _decreaseDelay(
+      DecreaseGarageDoorDelayEvent event, Emitter<GarageDoorState> emit) async {
     // if (deviceStatus.countdown1 != 0) {
     try {
       if (deviceStatus.delay.inMinutes > 10) {
-        deviceStatus = deviceStatus.copyWith(delay: deviceStatus.delay - Duration(minutes: 10));
+        deviceStatus = deviceStatus.copyWith(
+            delay: deviceStatus.delay - Duration(minutes: 10));
       }
       emit(GarageDoorLoadedState(status: deviceStatus));
-      add(GarageDoorControlEvent(deviceId: event.deviceId, value: deviceStatus.delay.inSeconds, code: 'countdown_1'));
+      add(GarageDoorControlEvent(
+          deviceId: event.deviceId,
+          value: deviceStatus.delay.inSeconds,
+          code: 'countdown_1'));
     } catch (e) {
       emit(GarageDoorErrorState(message: e.toString()));
     }
     //}
   }
 
-  void _garageDoorControlEvent(GarageDoorControlEvent event, Emitter<GarageDoorState> emit) async {
-    final oldValue = event.code == 'countdown_1' ? deviceStatus.countdown1 : deviceStatus.switch1;
+  void _garageDoorControlEvent(
+      GarageDoorControlEvent event, Emitter<GarageDoorState> emit) async {
+    final oldValue = event.code == 'countdown_1'
+        ? deviceStatus.countdown1
+        : deviceStatus.switch1;
     _updateLocalValue(event.code, event.value);
     emit(GarageDoorLoadedState(status: deviceStatus));
     final success = await _runDeBouncer(
@@ -327,7 +406,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     }
   }
 
-  void _revertValue(String code, dynamic oldValue, Emitter<GarageDoorState> emit) {
+  void _revertValue(
+      String code, dynamic oldValue, Emitter<GarageDoorState> emit) {
     switch (code) {
       case 'switch_1':
         if (oldValue is bool) {
@@ -336,7 +416,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         break;
       case 'countdown_1':
         if (oldValue is int) {
-          deviceStatus = deviceStatus.copyWith(countdown1: oldValue, delay: Duration(seconds: oldValue));
+          deviceStatus = deviceStatus.copyWith(
+              countdown1: oldValue, delay: Duration(seconds: oldValue));
         }
         break;
       // Add other cases if needed
@@ -358,7 +439,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         break;
       case 'countdown_1':
         if (value is int) {
-          deviceStatus = deviceStatus.copyWith(countdown1: value, delay: Duration(seconds: value));
+          deviceStatus = deviceStatus.copyWith(
+              countdown1: value, delay: Duration(seconds: value));
         }
         break;
       case 'countdown_alarm':
@@ -401,7 +483,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
     return super.close();
   }
 
-  FutureOr<void> _onEditSchedule(EditGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
+  FutureOr<void> _onEditSchedule(
+      EditGarageDoorScheduleEvent event, Emitter<GarageDoorState> emit) async {
     try {
       ScheduleEntry newSchedule = ScheduleEntry(
         scheduleId: event.scheduleId,
@@ -410,9 +493,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         function: Status(code: 'switch_1', value: event.functionOn),
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
-      bool success = await DevicesManagementApi().editScheduleRecord(deviceId, newSchedule);
+      bool success = await DevicesManagementApi()
+          .editScheduleRecord(deviceId, newSchedule);
       if (success) {
-        add(FetchGarageDoorSchedulesEvent(deviceId: deviceId, category: 'switch_1'));
+        add(FetchGarageDoorSchedulesEvent(
+            deviceId: deviceId, category: 'switch_1'));
       } else {
         emit(GarageDoorLoadedState(status: deviceStatus));
       }

lib/pages/device_managment/garage_door/bloc/garage_door_event.dart

@@ -3,6 +3,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/models/garage_door_model.dart';
 
 abstract class GarageDoorEvent extends Equatable {
   const GarageDoorEvent();
@@ -25,7 +26,8 @@ class GarageDoorControlEvent extends GarageDoorEvent {
   final dynamic value;
   final String code;
 
-  const GarageDoorControlEvent({required this.deviceId, required this.value, required this.code});
+  const GarageDoorControlEvent(
+      {required this.deviceId, required this.value, required this.code});
 
   @override
   List<Object?> get props => [deviceId, value];
@@ -121,7 +123,8 @@ class FetchGarageDoorRecordsEvent extends GarageDoorEvent {
   final String deviceId;
   final String code;
 
-  const FetchGarageDoorRecordsEvent({required this.deviceId, required this.code});
+  const FetchGarageDoorRecordsEvent(
+      {required this.deviceId, required this.code});
 
   @override
   List<Object?> get props => [deviceId, code];
@@ -232,3 +235,10 @@ class GarageDoorFactoryResetEvent extends GarageDoorEvent {
   @override
   List<Object?> get props => [factoryReset, deviceId];
 }
+
+class StatusUpdated extends GarageDoorEvent {
+  final GarageDoorStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/main_door_sensor/bloc/main_door_sensor_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:dio/dio.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
@@ -16,6 +17,7 @@ class MainDoorSensorBloc
     on<MainDoorSensorFetchBatchEvent>(_onFetchBatchStatus);
     on<MainDoorSensorReportsEvent>(_fetchReports);
     on<MainDoorSensorFactoryReset>(_factoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late MainDoorSensorStatusModel deviceStatus;
@@ -28,7 +30,7 @@ class MainDoorSensorBloc
       final status = await DevicesManagementApi()
           .getDeviceStatus(event.deviceId)
           .then((value) => value.status);
-
+      _listenToChanges(event.deviceId);
       deviceStatus = MainDoorSensorStatusModel.fromJson(event.deviceId, status);
       emit(MainDoorSensorDeviceStatusLoaded(deviceStatus));
     } catch (e) {
@@ -156,4 +158,35 @@ class MainDoorSensorBloc
       emit(MainDoorSensorFailedState(error: e.toString()));
     }
   }
+
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus = MainDoorSensorStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<MainDoorSensorState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(MainDoorSensorDeviceStatusLoaded(deviceStatus));
+  }
 }

lib/pages/device_managment/main_door_sensor/bloc/main_door_sensor_event.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/device_managment/main_door_sensor/models/main_door_status_model.dart';
 
 import '../../all_devices/models/factory_reset_model.dart';
 
@@ -71,3 +72,10 @@ class MainDoorSensorFactoryReset extends MainDoorSensorEvent {
   MainDoorSensorFactoryReset(
       {required this.deviceId, required this.factoryReset});
 }
+
+class StatusUpdated extends MainDoorSensorEvent {
+  final MainDoorSensorStatusModel deviceStatus;
+   StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:meta/meta.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
@@ -10,33 +11,71 @@ import 'package:syncrow_web/services/devices_mang_api.dart';
 part 'one_gang_glass_switch_event.dart';
 part 'one_gang_glass_switch_state.dart';
 
-class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassSwitchState> {
+class OneGangGlassSwitchBloc
+    extends Bloc<OneGangGlassSwitchEvent, OneGangGlassSwitchState> {
   OneGangGlassStatusModel deviceStatus;
   Timer? _timer;
 
   OneGangGlassSwitchBloc({required String deviceId})
-      : deviceStatus = OneGangGlassStatusModel(uuid: deviceId, switch1: false, countDown: 0),
+      : deviceStatus = OneGangGlassStatusModel(
+            uuid: deviceId, switch1: false, countDown: 0),
         super(OneGangGlassSwitchInitial()) {
     on<OneGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
     on<OneGangGlassSwitchControl>(_onControl);
     on<OneGangGlassSwitchBatchControl>(_onBatchControl);
     on<OneGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<OneGangGlassFactoryResetEvent>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-      OneGangGlassSwitchFetchDeviceEvent event, Emitter<OneGangGlassSwitchState> emit) async {
+  Future<void> _onFetchDeviceStatus(OneGangGlassSwitchFetchDeviceEvent event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      _listenToChanges(event.deviceId);
+      deviceStatus =
+          OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(OneGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onControl(OneGangGlassSwitchControl event, Emitter<OneGangGlassSwitchState> emit) async {
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus = OneGangGlassStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<OneGangGlassSwitchState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
+  }
+
+  Future<void> _onControl(OneGangGlassSwitchControl event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -52,10 +91,12 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
     );
   }
 
-  Future<void> _onFactoryReset(OneGangGlassFactoryResetEvent event, Emitter<OneGangGlassSwitchState> emit) async {
+  Future<void> _onFactoryReset(OneGangGlassFactoryResetEvent event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final response = await DevicesManagementApi().factoryReset(event.factoryReset, event.deviceId);
+      final response = await DevicesManagementApi()
+          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
         emit(OneGangGlassSwitchError('Failed to reset device'));
       } else {
@@ -66,7 +107,8 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
     }
   }
 
-  Future<void> _onBatchControl(OneGangGlassSwitchBatchControl event, Emitter<OneGangGlassSwitchState> emit) async {
+  Future<void> _onBatchControl(OneGangGlassSwitchBatchControl event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -83,11 +125,14 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
   }
 
   Future<void> _onFetchBatchStatus(
-      OneGangGlassSwitchFetchBatchStatusEvent event, Emitter<OneGangGlassSwitchState> emit) async {
+      OneGangGlassSwitchFetchBatchStatusEvent event,
+      Emitter<OneGangGlassSwitchState> emit) async {
     emit(OneGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-      deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = OneGangGlassStatusModel.fromJson(
+          event.deviceIds.first, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(OneGangGlassSwitchError(e.toString()));
@@ -117,9 +162,11 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
         } else {
-          response = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
         }
 
         if (!response) {
@@ -131,7 +178,8 @@ class OneGangGlassSwitchBloc extends Bloc<OneGangGlassSwitchEvent, OneGangGlassS
     });
   }
 
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue, Emitter<OneGangGlassSwitchState> emit) {
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<OneGangGlassSwitchState> emit) {
     _updateLocalValue(code, oldValue);
     emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
   }

lib/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_event.dart

@@ -39,6 +39,11 @@ class OneGangGlassSwitchFetchBatchStatusEvent extends OneGangGlassSwitchEvent {
   OneGangGlassSwitchFetchBatchStatusEvent(this.deviceIds);
 }
 
+class StatusUpdated extends OneGangGlassSwitchEvent {
+  final OneGangGlassStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+}
+
 class OneGangGlassFactoryResetEvent extends OneGangGlassSwitchEvent {
   final FactoryResetModel factoryReset;
   final String deviceId;

lib/pages/device_managment/one_gang_switch/bloc/wall_light_switch_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart';
@@ -16,6 +17,7 @@ class WallLightSwitchBloc
     on<WallLightSwitchFetchBatchEvent>(_onFetchBatchStatus);
     on<WallLightSwitchBatchControl>(_onBatchControl);
     on<WallLightFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late WallLightStatusModel deviceStatus;
@@ -31,12 +33,44 @@ class WallLightSwitchBloc
 
       deviceStatus =
           WallLightStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(WallLightSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(WallLightSwitchError(e.toString()));
     }
   }
 
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            WallLightStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<WallLightSwitchState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(WallLightSwitchStatusLoaded(deviceStatus));
+  }
+
   FutureOr<void> _onControl(
       WallLightSwitchControl event, Emitter<WallLightSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);

lib/pages/device_managment/one_gang_switch/bloc/wall_light_switch_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
 
 class WallLightSwitchEvent extends Equatable {
   @override
@@ -57,3 +58,10 @@ class WallLightFactoryReset extends WallLightSwitchEvent {
   @override
   List<Object> get props => [deviceId, factoryReset];
 }
+
+class StatusUpdated extends WallLightSwitchEvent {
+  final WallLightStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:meta/meta.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
@@ -10,7 +11,8 @@ import 'package:syncrow_web/services/devices_mang_api.dart';
 part 'three_gang_glass_switch_event.dart';
 part 'three_gang_glass_switch_state.dart';
 
-class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGangGlassSwitchState> {
+class ThreeGangGlassSwitchBloc
+    extends Bloc<ThreeGangGlassSwitchEvent, ThreeGangGlassSwitchState> {
   ThreeGangGlassStatusModel deviceStatus;
   Timer? _timer;
 
@@ -29,21 +31,57 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
     on<ThreeGangGlassSwitchBatchControl>(_onBatchControl);
     on<ThreeGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<ThreeGangGlassFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
-  Future<void> _onFetchDeviceStatus(
-      ThreeGangGlassSwitchFetchDeviceEvent event, Emitter<ThreeGangGlassSwitchState> emit) async {
+  Future<void> _onFetchDeviceStatus(ThreeGangGlassSwitchFetchDeviceEvent event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      deviceStatus = ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus =
+          ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(ThreeGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onControl(ThreeGangGlassSwitchControl event, Emitter<ThreeGangGlassSwitchState> emit) async {
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus = ThreeGangGlassStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<ThreeGangGlassSwitchState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
+  }
+
+  Future<void> _onControl(ThreeGangGlassSwitchControl event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -59,7 +97,8 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
     );
   }
 
-  Future<void> _onBatchControl(ThreeGangGlassSwitchBatchControl event, Emitter<ThreeGangGlassSwitchState> emit) async {
+  Future<void> _onBatchControl(ThreeGangGlassSwitchBatchControl event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value);
@@ -76,21 +115,26 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
   }
 
   Future<void> _onFetchBatchStatus(
-      ThreeGangGlassSwitchFetchBatchStatusEvent event, Emitter<ThreeGangGlassSwitchState> emit) async {
+      ThreeGangGlassSwitchFetchBatchStatusEvent event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-      deviceStatus = ThreeGangGlassStatusModel.fromJson(event.deviceIds.first, status.status);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = ThreeGangGlassStatusModel.fromJson(
+          event.deviceIds.first, status.status);
       emit(ThreeGangGlassSwitchBatchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(ThreeGangGlassSwitchError(e.toString()));
     }
   }
 
-  Future<void> _onFactoryReset(ThreeGangGlassFactoryReset event, Emitter<ThreeGangGlassSwitchState> emit) async {
+  Future<void> _onFactoryReset(ThreeGangGlassFactoryReset event,
+      Emitter<ThreeGangGlassSwitchState> emit) async {
     emit(ThreeGangGlassSwitchLoading());
     try {
-      final response = await DevicesManagementApi().factoryReset(event.factoryReset, event.deviceId);
+      final response = await DevicesManagementApi()
+          .factoryReset(event.factoryReset, event.deviceId);
       if (!response) {
         emit(ThreeGangGlassSwitchError('Failed'));
       } else {
@@ -124,9 +168,11 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
         } else {
-          response = await DevicesManagementApi().deviceControl(deviceId, Status(code: code, value: value));
+          response = await DevicesManagementApi()
+              .deviceControl(deviceId, Status(code: code, value: value));
         }
 
         if (!response) {
@@ -138,7 +184,8 @@ class ThreeGangGlassSwitchBloc extends Bloc<ThreeGangGlassSwitchEvent, ThreeGang
     });
   }
 
-  void _revertValueAndEmit(String deviceId, String code, bool oldValue, Emitter<ThreeGangGlassSwitchState> emit) {
+  void _revertValueAndEmit(String deviceId, String code, bool oldValue,
+      Emitter<ThreeGangGlassSwitchState> emit) {
     _updateLocalValue(code, oldValue);
     emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
   }

lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_event.dart

@@ -49,3 +49,10 @@ class ThreeGangGlassFactoryReset extends ThreeGangGlassSwitchEvent {
     required this.factoryReset,
   });
 }
+
+class StatusUpdated extends ThreeGangGlassSwitchEvent {
+  final ThreeGangGlassStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart

@@ -3,6 +3,7 @@
 import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
@@ -22,6 +23,7 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
     on<LivingRoomBatchControl>(_livingRoomBatchControl);
     on<LivingRoomFetchBatchEvent>(_livingRoomFetchBatchControl);
     on<LivingRoomFactoryResetEvent>(_livingRoomFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   FutureOr<void> _onFetchDeviceStatus(LivingRoomFetchDeviceStatusEvent event,
@@ -32,6 +34,7 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus =
           LivingRoomStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(deviceId);
       emit(LivingRoomDeviceStatusLoaded(deviceStatus));
     } catch (e) {
       emit(LivingRoomDeviceManagementError(e.toString()));
@@ -144,6 +147,9 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
           await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus =
           LivingRoomStatusModel.fromJson(event.devicesIds.first, status.status);
+      // for (var deviceId in event.devicesIds) {
+      //   _listenToChanges(deviceId);
+      // }
       emit(LivingRoomDeviceStatusLoaded(deviceStatus));
     } catch (e) {
       emit(LivingRoomDeviceManagementError(e.toString()));
@@ -185,4 +191,34 @@ class LivingRoomBloc extends Bloc<LivingRoomEvent, LivingRoomState> {
       emit(LivingRoomDeviceManagementError(e.toString()));
     }
   }
+
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            LivingRoomStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<LivingRoomState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(LivingRoomDeviceStatusLoaded(deviceStatus));
+  }
 }

lib/pages/device_managment/three_gang_switch/bloc/living_room_event.dart

@@ -58,3 +58,10 @@ class LivingRoomFactoryResetEvent extends LivingRoomEvent {
   @override
   List<Object> get props => [uuid, factoryReset];
 }
+
+class StatusUpdated extends LivingRoomEvent {
+  final LivingRoomStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart

@@ -1,12 +1,11 @@
 import 'dart:async';
-
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:meta/meta.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
-
 part 'two_gang_glass_switch_event.dart';
 part 'two_gang_glass_switch_state.dart';
 
@@ -14,7 +13,6 @@ class TwoGangGlassSwitchBloc
     extends Bloc<TwoGangGlassSwitchEvent, TwoGangGlassSwitchState> {
   TwoGangGlassStatusModel deviceStatus;
   Timer? _timer;
-
   TwoGangGlassSwitchBloc({required String deviceId})
       : deviceStatus = TwoGangGlassStatusModel(
             uuid: deviceId,
@@ -28,6 +26,7 @@ class TwoGangGlassSwitchBloc
     on<TwoGangGlassSwitchBatchControl>(_onBatchControl);
     on<TwoGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
     on<TwoGangGlassFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   Future<void> _onFetchDeviceStatus(TwoGangGlassSwitchFetchDeviceEvent event,
@@ -38,12 +37,44 @@ class TwoGangGlassSwitchBloc
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus =
           TwoGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
       emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(TwoGangGlassSwitchError(e.toString()));
     }
   }
 
+  void _listenToChanges(String deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      ref.onValue.listen((DatabaseEvent event) {
+        if (event.snapshot.value == null) return;
+
+        Map<dynamic, dynamic> data =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<Status> statusList = [];
+
+        data['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        // Parse the new status and add the event
+        final updatedStatus =
+            TwoGangGlassStatusModel.fromJson(data['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(updatedStatus));
+        }
+      });
+    } catch (e) {
+      // Handle errors and emit an error state if necessary
+      if (!isClosed) {
+        // add(TwoGangGlassSwitchError('Error listening to updates: $e'));
+      }
+    }
+  }
+
   Future<void> _onControl(TwoGangGlassSwitchControl event,
       Emitter<TwoGangGlassSwitchState> emit) async {
     final oldValue = _getValueByCode(event.code);
@@ -178,4 +209,37 @@ class TwoGangGlassSwitchBloc
     _timer?.cancel();
     return super.close();
   }
+
+  // _listenToChanges(deviceId) {
+  //   try {
+  //     DatabaseReference ref =
+  //         FirebaseDatabase.instance.ref('device-status/$deviceId');
+  //     Stream<DatabaseEvent> stream = ref.onValue;
+
+  //     stream.listen((DatabaseEvent event) {
+  //       Map<dynamic, dynamic> usersMap =
+  //           event.snapshot.value as Map<dynamic, dynamic>;
+
+  //       List<Status> statusList = [];
+  //       usersMap['status'].forEach((element) {
+  //         statusList
+  //             .add(Status(code: element['code'], value: element['value']));
+  //       });
+
+  //       deviceStatus = TwoGangGlassStatusModel.fromJson(
+  //           usersMap['productUuid'], statusList);
+  //       if (!isClosed) {
+  //         add(StatusUpdated(deviceStatus));
+  //       }
+  //     });
+  //   } catch (_) {}
+  // }
+
+  void _onStatusUpdated(
+      StatusUpdated event, Emitter<TwoGangGlassSwitchState> emit) {
+    // Update the local deviceStatus with the new status from the event
+    deviceStatus = event.deviceStatus;
+    // Emit the new state with the updated status
+    emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
+  }
 }

lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_event.dart

@@ -48,3 +48,11 @@ class TwoGangGlassFactoryReset extends TwoGangGlassSwitchEvent {
     required this.factoryReset,
   });
 }
+
+class StatusUpdated extends TwoGangGlassSwitchEvent {
+  final TwoGangGlassStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}
+

lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_control_view.dart

@@ -6,7 +6,8 @@ import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class TwoGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
+class TwoGangGlassSwitchControlView extends StatelessWidget
+    with HelperResponsiveLayout {
   final String deviceId;
 
   const TwoGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -14,25 +15,25 @@ class TwoGangGlassSwitchControlView extends StatelessWidget with HelperResponsiv
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) =>
-          TwoGangGlassSwitchBloc(deviceId: deviceId)..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
-      child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
-        builder: (context, state) {
-          if (state is TwoGangGlassSwitchLoading) {
-            return const Center(child: CircularProgressIndicator());
-          } else if (state is TwoGangGlassSwitchStatusLoaded) {
-            return _buildStatusControls(context, state.status);
-          } else if (state is TwoGangGlassSwitchError) {
-            return const Center(child: Text('Error fetching status'));
-          } else {
-            return const Center(child: CircularProgressIndicator());
-          }
-        },
-      ),
-    );
+        create: (context) => TwoGangGlassSwitchBloc(deviceId: deviceId)
+          ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
+        child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
+          builder: (context, state) {
+            if (state is TwoGangGlassSwitchLoading) {
+              return const Center(child: CircularProgressIndicator());
+            } else if (state is TwoGangGlassSwitchStatusLoaded) {
+              return _buildStatusControls(context, state.status);
+            } else if (state is TwoGangGlassSwitchError) {
+              return Center(child: Text(state.message));
+            } else {
+              return const Center(child: CircularProgressIndicator());
+            }
+          },
+        ));
   }
 
-  Widget _buildStatusControls(BuildContext context, TwoGangGlassStatusModel status) {
+  Widget _buildStatusControls(
+      BuildContext context, TwoGangGlassStatusModel status) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);

lib/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
@@ -14,6 +15,7 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
     on<TwoGangSwitchFetchBatchEvent>(_onFetchBatchStatus);
     on<TwoGangSwitchBatchControl>(_onBatchControl);
     on<TwoGangFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late TwoGangStatusModel deviceStatus;
@@ -26,8 +28,8 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
     try {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
-
       deviceStatus = TwoGangStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(emit);
       emit(TwoGangSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(TwoGangSwitchError(e.toString()));
@@ -174,4 +176,34 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
       emit(TwoGangSwitchError(e.toString()));
     }
   }
+
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            TwoGangStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<TwoGangSwitchState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(TwoGangSwitchStatusLoaded(deviceStatus));
+  }
 }

lib/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
 
 class TwoGangSwitchEvent extends Equatable {
   @override
@@ -57,3 +58,10 @@ class TwoGangFactoryReset extends TwoGangSwitchEvent {
   @override
   List<Object> get props => [deviceId, factoryReset];
 }
+
+class StatusUpdated extends TwoGangSwitchEvent {
+  final TwoGangStatusModel deviceStatus;
+  StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}

lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/wall_sensor/bloc/wall_event.dart';
@@ -29,7 +30,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       var response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-      // _listenToChanges();
+      _listenToChanges(emit);
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
       return;
@@ -38,10 +39,12 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
 
   // Fetch batch status
   FutureOr<void> _fetchWallSensorBatchControl(
-      WallSensorFetchBatchStatusEvent event, Emitter<WallSensorState> emit) async {
+      WallSensorFetchBatchStatusEvent event,
+      Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingInitialState());
     try {
-      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      var response =
+          await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
     } catch (e) {
@@ -49,26 +52,30 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  // _listenToChanges() {
-  //   try {
-  //     DatabaseReference ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-  //     Stream<DatabaseEvent> stream = ref.onValue;
+  _listenToChanges(Emitter<WallSensorState> emit) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
 
-  //     stream.listen((DatabaseEvent event) {
-  //       Map<dynamic, dynamic> usersMap = event.snapshot.value as Map<dynamic, dynamic>;
-  //       List<StatusModel> statusList = [];
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<Status> statusList = [];
 
-  //       usersMap['status'].forEach((element) {
-  //         statusList.add(StatusModel(code: element['code'], value: element['value']));
-  //       });
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
 
-  //       deviceStatus = WallSensorModel.fromJson(statusList);
-  //       add(WallSensorUpdatedEvent());
-  //     });
-  //   } catch (_) {}
-  // }
+        deviceStatus = WallSensorModel.fromJson(statusList);
+        emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
+      });
+    } catch (_) {}
+  }
 
-  void _changeValue(WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
+  void _changeValue(
+      WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
     if (event.code == 'far_detection') {
       deviceStatus.farDetection = event.value;
@@ -125,7 +132,8 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       try {
         late bool response;
         if (isBatch) {
-          response = await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+          response = await DevicesManagementApi()
+              .deviceBatchControl(deviceId, code, value);
         } else {
           response = await DevicesManagementApi()
               .deviceControl(deviceId, Status(code: code, value: value));
@@ -150,7 +158,8 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     try {
       // await DevicesManagementApi.getDeviceReportsByDate(
       //         deviceId, event.code, from.toString(), to.toString())
-      await DevicesManagementApi.getDeviceReports(deviceId, event.code).then((value) {
+      await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+          .then((value) {
         emit(DeviceReportsState(deviceReport: value, code: event.code));
       });
     } catch (e) {
@@ -159,11 +168,13 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  void _showDescription(ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
+  void _showDescription(
+      ShowDescriptionEvent event, Emitter<WallSensorState> emit) {
     emit(WallSensorShowDescriptionState(description: event.description));
   }
 
-  void _backToGridView(BackToGridViewEvent event, Emitter<WallSensorState> emit) {
+  void _backToGridView(
+      BackToGridViewEvent event, Emitter<WallSensorState> emit) {
     emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
   }
 

lib/pages/device_managment/water_heater/bloc/water_heater_bloc.dart

@@ -4,6 +4,7 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
@@ -34,6 +35,7 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     on<EditWaterHeaterScheduleEvent>(_onEditSchedule);
     on<DeleteScheduleEvent>(_onDeleteSchedule);
     on<UpdateScheduleEntryEvent>(_onUpdateSchedule);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   late WaterHeaterStatusModel deviceStatus;
@@ -78,7 +80,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     final currentState = state as WaterHeaterDeviceStatusLoaded;
     final updatedDays = List<bool>.from(currentState.selectedDays);
     updatedDays[event.index] = event.value;
-    emit(currentState.copyWith(selectedDays: updatedDays, selectedTime: currentState.selectedTime));
+    emit(currentState.copyWith(
+        selectedDays: updatedDays, selectedTime: currentState.selectedTime));
   }
 
   FutureOr<void> _updateFunctionOn(
@@ -86,7 +89,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     Emitter<WaterHeaterState> emit,
   ) {
     final currentState = state as WaterHeaterDeviceStatusLoaded;
-    emit(currentState.copyWith(functionOn: event.isOn, selectedTime: currentState.selectedTime));
+    emit(currentState.copyWith(
+        functionOn: event.isOn, selectedTime: currentState.selectedTime));
   }
 
   FutureOr<void> _updateScheduleEvent(
@@ -101,7 +105,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
         ));
       }
       if (event.scheduleMode == ScheduleModes.countdown) {
-        final countdownRemaining = Duration(hours: event.hours, minutes: event.minutes);
+        final countdownRemaining =
+            Duration(hours: event.hours, minutes: event.minutes);
 
         emit(currentState.copyWith(
           scheduleMode: ScheduleModes.countdown,
@@ -111,11 +116,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           countdownRemaining: countdownRemaining,
         ));
 
-        if (!currentState.isCountdownActive! && countdownRemaining > Duration.zero) {
+        if (!currentState.isCountdownActive! &&
+            countdownRemaining > Duration.zero) {
           _startCountdownTimer(emit, countdownRemaining);
         }
       } else if (event.scheduleMode == ScheduleModes.inching) {
-        final inchingDuration = Duration(hours: event.hours, minutes: event.minutes);
+        final inchingDuration =
+            Duration(hours: event.hours, minutes: event.minutes);
 
         emit(currentState.copyWith(
           scheduleMode: ScheduleModes.inching,
@@ -217,7 +224,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
       try {
         final status = await DevicesManagementApi().deviceControl(
           event.deviceId,
-          Status(code: isCountDown ? 'countdown_1' : 'switch_inching', value: 0),
+          Status(
+              code: isCountDown ? 'countdown_1' : 'switch_inching', value: 0),
         );
         if (!status) {
           emit(const WaterHeaterFailedState(error: 'Failed to stop schedule.'));
@@ -235,8 +243,10 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     emit(WaterHeaterLoadingState());
 
     try {
-      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      deviceStatus = WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus =
+          WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
 
       if (deviceStatus.scheduleMode == ScheduleModes.countdown) {
         final countdownRemaining = Duration(
@@ -300,11 +310,42 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
           isInchingActive: false,
         ));
       }
+      _listenToChanges(event.deviceId);
     } catch (e) {
       emit(WaterHeaterFailedState(error: e.toString()));
     }
   }
 
+  _listenToChanges(deviceId) {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus = WaterHeaterStatusModel.fromJson(
+            usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<WaterHeaterState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(WaterHeaterDeviceStatusLoaded(deviceStatus));
+  }
+
   void _startCountdownTimer(
     Emitter<WaterHeaterState> emit,
     Duration countdownRemaining,
@@ -334,8 +375,10 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
-      if (currentState.countdownRemaining != null && currentState.countdownRemaining! > Duration.zero) {
-        final newRemaining = currentState.countdownRemaining! - const Duration(minutes: 1);
+      if (currentState.countdownRemaining != null &&
+          currentState.countdownRemaining! > Duration.zero) {
+        final newRemaining =
+            currentState.countdownRemaining! - const Duration(minutes: 1);
 
         if (newRemaining <= Duration.zero) {
           _countdownTimer?.cancel();
@@ -430,7 +473,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  void _revertValue(String code, dynamic oldValue, void Function(WaterHeaterState state) emit) {
+  void _revertValue(String code, dynamic oldValue,
+      void Function(WaterHeaterState state) emit) {
     _updateLocalValue(code, oldValue);
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
@@ -477,12 +521,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     return super.close();
   }
 
-  FutureOr<void> _getSchedule(GetSchedulesEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _getSchedule(
+      GetSchedulesEvent event, Emitter<WaterHeaterState> emit) async {
     emit(ScheduleLoadingState());
 
     try {
-      List<ScheduleModel> schedules =
-          await DevicesManagementApi().getDeviceSchedules(deviceStatus.uuid, event.category);
+      List<ScheduleModel> schedules = await DevicesManagementApi()
+          .getDeviceSchedules(deviceStatus.uuid, event.category);
 
       emit(WaterHeaterDeviceStatusLoaded(
         deviceStatus,
@@ -514,7 +559,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
       // emit(ScheduleLoadingState());
 
-      bool success = await DevicesManagementApi().addScheduleRecord(newSchedule, currentState.status.uuid);
+      bool success = await DevicesManagementApi()
+          .addScheduleRecord(newSchedule, currentState.status.uuid);
 
       if (success) {
         add(GetSchedulesEvent(category: 'switch_1', uuid: deviceStatus.uuid));
@@ -525,7 +571,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _onEditSchedule(EditWaterHeaterScheduleEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _onEditSchedule(EditWaterHeaterScheduleEvent event,
+      Emitter<WaterHeaterState> emit) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 
@@ -594,11 +641,13 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
 
       // emit(ScheduleLoadingState());
 
-      bool success = await DevicesManagementApi().deleteScheduleRecord(currentState.status.uuid, event.scheduleId);
+      bool success = await DevicesManagementApi()
+          .deleteScheduleRecord(currentState.status.uuid, event.scheduleId);
 
       if (success) {
-        final updatedSchedules =
-            currentState.schedules.where((schedule) => schedule.scheduleId != event.scheduleId).toList();
+        final updatedSchedules = currentState.schedules
+            .where((schedule) => schedule.scheduleId != event.scheduleId)
+            .toList();
 
         emit(currentState.copyWith(schedules: updatedSchedules));
       } else {
@@ -608,12 +657,15 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _batchFetchWaterHeater(FetchWaterHeaterBatchStatusEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _batchFetchWaterHeater(FetchWaterHeaterBatchStatusEvent event,
+      Emitter<WaterHeaterState> emit) async {
     emit(WaterHeaterLoadingState());
 
     try {
-      final status = await DevicesManagementApi().getBatchStatus(event.devicesUuid);
-      deviceStatus = WaterHeaterStatusModel.fromJson(event.devicesUuid.first, status.status);
+      final status =
+          await DevicesManagementApi().getBatchStatus(event.devicesUuid);
+      deviceStatus = WaterHeaterStatusModel.fromJson(
+          event.devicesUuid.first, status.status);
 
       emit(WaterHeaterDeviceStatusLoaded(deviceStatus));
     } catch (e) {
@@ -621,7 +673,8 @@ class WaterHeaterBloc extends Bloc<WaterHeaterEvent, WaterHeaterState> {
     }
   }
 
-  FutureOr<void> _batchControlWaterHeater(ControlWaterHeaterBatchEvent event, Emitter<WaterHeaterState> emit) async {
+  FutureOr<void> _batchControlWaterHeater(ControlWaterHeaterBatchEvent event,
+      Emitter<WaterHeaterState> emit) async {
     if (state is WaterHeaterDeviceStatusLoaded) {
       final currentState = state as WaterHeaterDeviceStatusLoaded;
 

lib/pages/device_managment/water_heater/bloc/water_heater_event.dart

@@ -54,6 +54,15 @@ final class WaterHeaterFetchStatusEvent extends WaterHeaterEvent {
 
 final class DecrementCountdownEvent extends WaterHeaterEvent {}
 
+
+class StatusUpdated extends WaterHeaterEvent {
+  final WaterHeaterStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}
+
+
 final class AddScheduleEvent extends WaterHeaterEvent {
   final List<bool> selectedDays;
   final TimeOfDay time;

lib/pages/device_managment/water_leak/bloc/water_leak_bloc.dart

@@ -1,4 +1,5 @@
 import 'package:bloc/bloc.dart';
+import 'package:firebase_database/firebase_database.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_reports.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/water_leak/bloc/water_leak_event.dart';
@@ -21,6 +22,7 @@ class WaterLeakBloc extends Bloc<WaterLeakEvent, WaterLeakState> {
     on<FetchWaterLeakBatchStatusEvent>(_onFetchBatchStatus);
     on<FetchWaterLeakReportsEvent>(_onFetchWaterLeakReports);
     on<WaterLeakFactoryResetEvent>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
   }
 
   Future<void> _onFetchWaterLeakStatus(
@@ -30,12 +32,43 @@ class WaterLeakBloc extends Bloc<WaterLeakEvent, WaterLeakState> {
       final response =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = WaterLeakStatusModel.fromJson(deviceId, response.status);
+      _listenToChanges();
       emit(WaterLeakLoadedState(deviceStatus!));
     } catch (e) {
       emit(WaterLeakErrorState(e.toString()));
     }
   }
 
+  _listenToChanges() {
+    try {
+      DatabaseReference ref =
+          FirebaseDatabase.instance.ref('device-status/$deviceId');
+      Stream<DatabaseEvent> stream = ref.onValue;
+
+      stream.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+
+        List<Status> statusList = [];
+        usersMap['status'].forEach((element) {
+          statusList
+              .add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus =
+            WaterLeakStatusModel.fromJson(usersMap['productUuid'], statusList);
+        if (!isClosed) {
+          add(StatusUpdated(deviceStatus!));
+        }
+      });
+    } catch (_) {}
+  }
+
+  void _onStatusUpdated(StatusUpdated event, Emitter<WaterLeakState> emit) {
+    deviceStatus = event.deviceStatus;
+    emit(WaterLeakLoadedState(deviceStatus!));
+  }
+
   Future<void> _onControl(
       WaterLeakControlEvent event, Emitter<WaterLeakState> emit) async {
     final oldValue = deviceStatus!.watersensorState;

lib/pages/device_managment/water_leak/bloc/water_leak_event.dart

@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/water_leak/model/water_leak_status_model.dart';
 
 abstract class WaterLeakEvent extends Equatable {
   const WaterLeakEvent();
@@ -17,6 +18,13 @@ class FetchWaterLeakStatusEvent extends WaterLeakEvent {
   List<Object> get props => [deviceId];
 }
 
+class StatusUpdated extends WaterLeakEvent {
+  final WaterLeakStatusModel deviceStatus;
+  const StatusUpdated(this.deviceStatus);
+  @override
+  List<Object> get props => [deviceStatus];
+}
+
 class WaterLeakControlEvent extends WaterLeakEvent {
   final String deviceId;
   final String code;

lib/pages/home/bloc/home_bloc.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
@@ -51,6 +52,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
       add(FetchTermEvent());
+      add(FetchPolicyEvent());
+
       emit(HomeInitial());
     } catch (e) {
       return;
@@ -61,8 +64,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
-      add(FetchPolicyEvent());
-      emit(PolicyAgreement());
+      emit(HomeInitial());
     } catch (e) {
       return;
     }
@@ -72,8 +74,9 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
-      emit(PolicyAgreement());
+      emit(HomeInitial());
     } catch (e) {
+      debugPrint("Error fetching policy: $e");
       return;
     }
   }
@@ -103,7 +106,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   List<HomeItemModel> homeItems = [
     HomeItemModel(
-      title: 'Access',
+      title: 'Access Management',
       icon: Assets.accessIcon,
       active: true,
       onPress: (context) {
@@ -121,7 +124,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       color: ColorsManager.primaryColor,
     ),
     HomeItemModel(
-      title: 'Devices',
+      title: 'Devices Management',
       icon: Assets.devicesIcon,
       active: true,
       onPress: (context) {
@@ -131,6 +134,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       },
       color: ColorsManager.primaryColor,
     ),
+    
     // HomeItemModel(
     //   title: 'Move in',
     //   icon: Assets.moveinIcon,

lib/pages/home/view/home_page_web.dart

@@ -9,103 +9,121 @@ import 'package:syncrow_web/pages/home/view/home_card.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class HomeWebPage extends StatelessWidget {
+class HomeWebPage extends StatefulWidget {
   const HomeWebPage({super.key});
 
+  @override
+  State<HomeWebPage> createState() => _HomeWebPageState();
+}
+
+class _HomeWebPageState extends State<HomeWebPage> {
+  // Flag to track whether the dialog is already shown.
+  bool _dialogShown = false;
+
+  @override
+  void initState() {
+    super.initState();
+    final homeBloc = BlocProvider.of<HomeBloc>(context);
+    homeBloc.add(FetchUserInfo());
+  }
+
   @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) {
-            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());
-                    }
-                  });
+      canPop: false,
+      onPopInvoked: (didPop) => false,
+      child: BlocConsumer<HomeBloc, HomeState>(
+        listener: (BuildContext context, state) {
+          if (state is HomeInitial) {
+            if (homeBloc.user!.hasAcceptedWebAgreement == false && !_dialogShown) {
+              _dialogShown = true; // Set the flag to true to indicate the dialog is showing.
+              Future.delayed(const Duration(seconds: 1), () {
+                showDialog(
+                  context: context,
+                  barrierDismissible: false,
+                  builder: (BuildContext context) {
+                    return AgreementAndPrivacyDialog(
+                      terms: homeBloc.terms,
+                      policy: homeBloc.policy,
+                    );
+                  },
+                ).then((v) {
+                  _dialogShown = false;
+                  if (v != null) {
+                    homeBloc.add(ConfirmUserAgreementEvent());
+                    homeBloc.add(const FetchUserInfo());
+                  }
                 });
-              }
+              });
             }
-          },
-          builder: (context, state) {
-            return WebScaffold(
-              enableMenuSidebar: false,
-              appBarTitle: Row(
+          }
+        },
+        builder: (context, state) {
+          return WebScaffold(
+            enableMenuSidebar: false,
+            appBarTitle: Row(
+              children: [
+                SvgPicture.asset(
+                  Assets.loginLogo,
+                  width: 150,
+                ),
+              ],
+            ),
+            scaffoldBody: SizedBox(
+              height: size.height,
+              width: size.width,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  SvgPicture.asset(
-                    Assets.loginLogo,
-                    width: 150,
+                  Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      SizedBox(height: size.height * 0.1),
+                      Text(
+                        'ACCESS YOUR APPS',
+                        style: Theme.of(context)
+                            .textTheme
+                            .headlineLarge!
+                            .copyWith(color: Colors.black, fontSize: 40),
+                      ),
+                      const SizedBox(height: 30),
+                      Expanded(
+                        flex: 4,
+                        child: SizedBox(
+                          height: size.height * 0.6,
+                          width: size.width * 0.68,
+                          child: GridView.builder(
+                            itemCount: 3, // Change this count if needed.
+                            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                              crossAxisCount: 3, // Adjust as needed.
+                              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),
+                              );
+                            },
+                          ),
+                        ),
+                      ),
+                    ],
                   ),
                 ],
               ),
-              scaffoldBody: SizedBox(
-                height: size.height,
-                width: size.width,
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Column(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
-                        SizedBox(height: size.height * 0.1),
-                        Text(
-                          'ACCESS YOUR APPS',
-                          style: Theme.of(context)
-                              .textTheme
-                              .headlineLarge!
-                              .copyWith(color: Colors.black, fontSize: 40),
-                        ),
-                        const SizedBox(height: 30),
-                        Expanded(
-                          flex: 4,
-                          child: SizedBox(
-                            height: size.height * 0.6,
-                            width: size.width * 0.68,
-                            child: GridView.builder(
-                              itemCount: 3, //8
-                              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                                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),
-                                );
-                              },
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            );
-          },
-        ));
+            ),
+          );
+        },
+      ),
+    );
   }
 }

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

@@ -79,7 +79,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   List<TreeNode> updatedCommunities = [];
   List<TreeNode> spacesNodes = [];
-  List<String> communityIds = []; 
+  List<String> communityIds = [];
   _onLoadCommunityAndSpaces(
       LoadCommunityAndSpacesEvent event, Emitter<UsersState> emit) async {
     try {
@@ -102,12 +102,19 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           );
         }).toList(),
       );
+      originalCommunities = updatedCommunities;
       emit(const SpacesLoadedState());
     } catch (e) {
       emit(ErrorState('Error loading communities and spaces: $e'));
     }
   }
 
+// This variable holds the full original list.
+  List<TreeNode> originalCommunities = [];
+
+// This variable holds the working list that may be filtered.
+
+// Build tree nodes from your data model.
   List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
     return spaces.map((space) {
       List<TreeNode> childNodes =
@@ -123,12 +130,39 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }).toList();
   }
 
+// Optional helper method to deep clone a TreeNode.
+  TreeNode _cloneNode(TreeNode node) {
+    return TreeNode(
+      uuid: node.uuid,
+      title: node.title,
+      isChecked: node.isChecked,
+      isHighlighted: node.isHighlighted,
+      isExpanded: node.isExpanded,
+      children: node.children.map(_cloneNode).toList(),
+    );
+  }
+
+// Clone an entire list of tree nodes.
+  List<TreeNode> _cloneNodes(List<TreeNode> nodes) {
+    return nodes.map(_cloneNode).toList();
+  }
+
+// Your search event handler.
   void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
+
+    // If the search term is empty, restore the original list.
     if (event.searchTerm!.isEmpty) {
+      // Clear any highlights on the restored copy.
+      updatedCommunities = _cloneNodes(originalCommunities);
       _clearHighlights(updatedCommunities);
     } else {
-      _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
+      // Start with a fresh clone of the original tree.
+      List<TreeNode> freshClone = _cloneNodes(originalCommunities);
+
+      _searchAndHighlightNodes(freshClone, event.searchTerm!);
+
+      updatedCommunities = _filterNodes(freshClone, event.searchTerm!);
     }
     emit(ChangeStatusSteps());
   }
@@ -155,6 +189,91 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     return anyMatch;
   }
 
+  List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
+    List<TreeNode> filteredNodes = [];
+    for (var node in nodes) {
+      bool isMatch =
+          node.title.toLowerCase().contains(searchTerm.toLowerCase());
+      List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
+      if (isMatch || filteredChildren.isNotEmpty) {
+        node.isHighlighted = isMatch;
+        node.children = filteredChildren;
+        filteredNodes.add(node);
+      }
+    }
+    return filteredNodes;
+  }
+
+  // List<TreeNode> _buildTreeNodes(List<SpaceModel> spaces) {
+  //   return spaces.map((space) {
+  //     List<TreeNode> childNodes =
+  //         space.children.isNotEmpty ? _buildTreeNodes(space.children) : [];
+  //     return TreeNode(
+  //       uuid: space.uuid!,
+  //       title: space.name,
+  //       isChecked: false,
+  //       isHighlighted: false,
+  //       isExpanded: childNodes.isNotEmpty,
+  //       children: childNodes,
+  //     );
+  //   }).toList();
+  // }
+
+  // void searchTreeNode(SearchAnode event, Emitter<UsersState> emit) {
+  //   emit(UsersLoadingState());
+  //   if (event.searchTerm!.isEmpty) {
+  //     _clearHighlights(updatedCommunities);
+  //   } else {
+  //     _searchAndHighlightNodes(updatedCommunities, event.searchTerm!);
+  //     updatedCommunities = _filterNodes(updatedCommunities, event.searchTerm!);
+  //   }
+  //   emit(ChangeStatusSteps());
+  // }
+
+  // void _clearHighlights(List<TreeNode> nodes) {
+  //   for (var node in nodes) {
+  //     node.isHighlighted = false;
+  //     if (node.children.isNotEmpty) {
+  //       _clearHighlights(node.children);
+  //     }
+  //   }
+  // }
+
+  // bool _searchAndHighlightNodes(List<TreeNode> nodes, String searchTerm) {
+  //   bool anyMatch = false;
+  //   for (var node in nodes) {
+  //     bool isMatch =
+  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
+  //     bool childMatch = _searchAndHighlightNodes(node.children, searchTerm);
+  //     node.isHighlighted = isMatch || childMatch;
+
+  //     anyMatch = anyMatch || node.isHighlighted;
+  //   }
+  //   return anyMatch;
+  // }
+
+  // List<TreeNode> _filterNodes(List<TreeNode> nodes, String searchTerm) {
+  //   List<TreeNode> filteredNodes = [];
+  //   for (var node in nodes) {
+  //     // Check if the current node's title contains the search term.
+  //     bool isMatch =
+  //         node.title.toLowerCase().contains(searchTerm.toLowerCase());
+
+  //     // Recursively filter the children.
+  //     List<TreeNode> filteredChildren = _filterNodes(node.children, searchTerm);
+
+  //     // If the current node is a match or any of its children are, include it.
+  //     if (isMatch || filteredChildren.isNotEmpty) {
+  //       // Optionally, update any properties (like isHighlighted) if you still need them.
+  //       node.isHighlighted = isMatch;
+  //       // Replace the children with the filtered ones.
+  //       node.children = filteredChildren;
+  //       filteredNodes.add(node);
+  //     }
+  //   }
+  //   return filteredNodes;
+  // }
+
   List<String> selectedIds = [];
 
   List<String> getSelectedIds(List<TreeNode> nodes) {
@@ -221,7 +340,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
         lastName: lastNameController.text,
         phoneNumber: phoneController.text,
         roleUuid: roleSelected,
-        spaceUuids: selectedIds, 
+        spaceUuids: selectedIds,
       );
 
       if (res) {
@@ -251,12 +370,11 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
   }
 
-
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
       List<String> selectedIds = getSelectedIds(updatedCommunities)
-          .where((id) => !communityIds.contains(id)) 
+          .where((id) => !communityIds.contains(id))
           .toList();
 
       bool res = await UserPermissionApi().editInviteUser(

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

@@ -34,8 +34,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
               return Dialog(
                   child: Container(
                 decoration: const BoxDecoration(
-                    color: Colors.white,
-                    borderRadius: BorderRadius.all(Radius.circular(20))),
+                    color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
                 width: 900,
                 child: Column(
                   children: [
@@ -64,8 +63,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 children: [
                                   _buildStep1Indicator(1, "Basics", _blocRole),
                                   _buildStep2Indicator(2, "Spaces", _blocRole),
-                                  _buildStep3Indicator(
-                                      3, "Role & Permissions", _blocRole),
+                                  _buildStep3Indicator(3, "Role & Permissions", _blocRole),
                                 ],
                               ),
                             ),
@@ -113,15 +111,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 if (currentStep < 3) {
                                   currentStep++;
                                   if (currentStep == 2) {
-                                    _blocRole.add(
-                                        const CheckStepStatus(isEditUser: false));
+                                    _blocRole.add(const CheckStepStatus(isEditUser: false));
                                   } else if (currentStep == 3) {
-                                    _blocRole
-                                        .add(const CheckSpacesStepStatus());
+                                    _blocRole.add(const CheckSpacesStepStatus());
                                   }
                                 } else {
-                                  _blocRole
-                                      .add(SendInviteUsers(context: context));
+                                  _blocRole.add(SendInviteUsers(context: context));
                                 }
                               });
                             },
@@ -129,11 +124,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                               currentStep < 3 ? "Next" : "Save",
                               style: TextStyle(
                                   color: (_blocRole.isCompleteSpaces == false ||
-                                              _blocRole.isCompleteBasics ==
-                                                  false ||
-                                              _blocRole
-                                                      .isCompleteRolePermissions ==
-                                                  false) &&
+                                              _blocRole.isCompleteBasics == false ||
+                                              _blocRole.isCompleteRolePermissions == false) &&
                                           currentStep == 3
                                       ? ColorsManager.grayColor
                                       : ColorsManager.secondaryColor),
@@ -204,12 +196,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],
@@ -236,12 +224,16 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
     return GestureDetector(
       onTap: () {
         setState(() {
-          currentStep = step;
           bloc.add(const CheckStepStatus(isEditUser: false));
+          currentStep = step;
+          Future.delayed(const Duration(milliseconds: 500), () {
+            bloc.add(const CheckStepStatus(isEditUser: false));
+          });
           if (step3 == 3) {
-            bloc.add(const CheckRoleStepStatus());
+            Future.delayed(const Duration(seconds: 1), () {
+              bloc.add(const CheckRoleStepStatus());
+            });
           }
-          
         });
       },
       child: Column(
@@ -268,12 +260,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],
@@ -330,12 +318,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],

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

@@ -46,117 +46,120 @@ class BasicsView extends StatelessWidget {
             ),
             Row(
               children: [
-                SizedBox(
-                  width: MediaQuery.of(context).size.width * 0.18,
-                  height: MediaQuery.of(context).size.width * 0.08,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      SizedBox(
-                          child: Row(
-                        children: [
-                          const Text(
-                            " * ",
-                            style: TextStyle(
-                              color: ColorsManager.red,
-                              fontWeight: FontWeight.w900,
-                              fontSize: 15,
+                Flexible(
+                  child: SizedBox(
+                    // width: MediaQuery.of(context).size.width * 0.18,
+                    height: MediaQuery.of(context).size.width * 0.08,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        SizedBox(
+                            child: Row(
+                          children: [
+                            const Text(
+                              " * ",
+                              style: TextStyle(
+                                color: ColorsManager.red,
+                                fontWeight: FontWeight.w900,
+                                fontSize: 15,
+                              ),
                             ),
-                          ),
-                          Text(
-                            'First Name',
-                            style: context.textTheme.bodyMedium?.copyWith(
-                              fontWeight: FontWeight.w400,
-                              fontSize: 13,
-                            ),
-                          ),
-                        ],
-                      )),
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: TextFormField(
-                          style:
-                              const TextStyle(color: ColorsManager.blackColor),
-                          // onChanged: (value) {
-                          //   Future.delayed(const Duration(milliseconds: 200),
-                          //       () {
-                          //     _blocRole.add(const ValidateBasicsStep());
-                          //   });
-                          // },
-                          controller: _blocRole.firstNameController,
-                          decoration: inputTextFormDeco(
-                            hintText: "Enter first name",
-                          ).copyWith(
-                            hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                fontWeight: FontWeight.w400,
-                                fontSize: 12,
-                                color: ColorsManager.textGray),
-                          ),
-                          validator: (value) {
-                            if (value == null || value.isEmpty) {
-                              return 'Enter first name';
-                            }
-                            return null;
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(width: 10),
-                SizedBox(
-                  width: MediaQuery.of(context).size.width * 0.18,
-                  height: MediaQuery.of(context).size.width * 0.08,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      SizedBox(
-                          child: Row(
-                        children: [
-                          const Text(
-                            " * ",
-                            style: TextStyle(
-                              color: ColorsManager.red,
-                              fontWeight: FontWeight.w900,
-                              fontSize: 15,
-                            ),
-                          ),
-                          Text('Last Name',
+                            Text(
+                              'First Name',
                               style: context.textTheme.bodyMedium?.copyWith(
                                 fontWeight: FontWeight.w400,
                                 fontSize: 13,
-                              )),
-                        ],
-                      )),
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: TextFormField(
-                          // onChanged: (value) {
-                          //   Future.delayed(const Duration(milliseconds: 200),
-                          //       () {
-                          //     _blocRole.add(ValidateBasicsStep());
-                          //   });
-                          // },
-                          controller: _blocRole.lastNameController,
-                          style: const TextStyle(color: Colors.black),
-                          decoration:
-                              inputTextFormDeco(hintText: "Enter last name")
-                                  .copyWith(
-                                      hintStyle: context
-                                          .textTheme.bodyMedium
-                                          ?.copyWith(
-                                              fontWeight: FontWeight.w400,
-                                              fontSize: 12,
-                                              color: ColorsManager.textGray)),
-                          validator: (value) {
-                            if (value == null || value.isEmpty) {
-                              return 'Enter last name';
-                            }
-                            return null;
-                          },
+                              ),
+                            ),
+                          ],
+                        )),
+                        Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: TextFormField(
+                            style: const TextStyle(
+                                color: ColorsManager.blackColor),
+                            // onChanged: (value) {
+                            //   Future.delayed(const Duration(milliseconds: 200),
+                            //       () {
+                            //     _blocRole.add(const ValidateBasicsStep());
+                            //   });
+                            // },
+                            controller: _blocRole.firstNameController,
+                            decoration: inputTextFormDeco(
+                              hintText: "Enter first name",
+                            ).copyWith(
+                              hintStyle: context.textTheme.bodyMedium?.copyWith(
+                                  fontWeight: FontWeight.w400,
+                                  fontSize: 12,
+                                  color: ColorsManager.textGray),
+                            ),
+                            validator: (value) {
+                              if (value == null || value.isEmpty) {
+                                return 'Enter first name';
+                              }
+                              return null;
+                            },
+                          ),
                         ),
-                      ),
-                    ],
+                      ],
+                    ),
+                  ),
+                ),
+                const SizedBox(width: 10),
+                Flexible(
+                  child: SizedBox(
+                    // width: MediaQuery.of(context).size.width * 0.18,
+                    height: MediaQuery.of(context).size.width * 0.08,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        SizedBox(
+                            child: Row(
+                          children: [
+                            const Text(
+                              " * ",
+                              style: TextStyle(
+                                color: ColorsManager.red,
+                                fontWeight: FontWeight.w900,
+                                fontSize: 15,
+                              ),
+                            ),
+                            Text('Last Name',
+                                style: context.textTheme.bodyMedium?.copyWith(
+                                  fontWeight: FontWeight.w400,
+                                  fontSize: 13,
+                                )),
+                          ],
+                        )),
+                        Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: TextFormField(
+                            // onChanged: (value) {
+                            //   Future.delayed(const Duration(milliseconds: 200),
+                            //       () {
+                            //     _blocRole.add(ValidateBasicsStep());
+                            //   });
+                            // },
+                            controller: _blocRole.lastNameController,
+                            style: const TextStyle(color: Colors.black),
+                            decoration:
+                                inputTextFormDeco(hintText: "Enter last name")
+                                    .copyWith(
+                                        hintStyle: context.textTheme.bodyMedium
+                                            ?.copyWith(
+                                                fontWeight: FontWeight.w400,
+                                                fontSize: 12,
+                                                color: ColorsManager.textGray)),
+                            validator: (value) {
+                              if (value == null || value.isEmpty) {
+                                return 'Enter last name';
+                              }
+                              return null;
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
                   ),
                 ),
               ],

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

@@ -27,7 +27,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   int currentPage = 1;
   List<RolesUserModel> users = [];
   List<RolesUserModel> initialUsers = [];
+
+  List<RolesUserModel> totalUsersCount = [];
   String currentSortOrder = '';
+
+  String currentSortJopTitle = '';
+  String currentSortRole = '';
+  String currentSortCreatedDate = '';
+  String currentSortStatus = '';
+  String currentSortCreatedBy = '';
+
   String currentSortOrderDate = '';
   List<String> roleTypes = [];
   List<String> jobTitle = [];
@@ -60,6 +69,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       jobTitle = jobTitle.toSet().toList();
       createdBy = createdBy.toSet().toList();
       _handlePageChange(ChangePage(1), emit);
+      totalUsersCount = initialUsers;
       add(ChangePage(currentPage));
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -91,26 +101,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
           event.userId, event.newStatus == "disabled" ? false : true);
       if (res == true) {
         add(const GetUsers());
-        // users = users.map((user) {
-        //   if (user.uuid == event.userId) {
-        //     return RolesUserModel(
-        //       uuid: user.uuid,
-        //       createdAt: user.createdAt,
-        //       email: user.email,
-        //       firstName: user.firstName,
-        //       lastName: user.lastName,
-        //       roleType: user.roleType,
-        //       status: event.newStatus,
-        //       isEnabled: event.newStatus == "disabled" ? false : true,
-        //       invitedBy: user.invitedBy,
-        //       phoneNumber: user.phoneNumber,
-        //       jobTitle: user.jobTitle,
-        //       createdDate: user.createdDate,
-        //       createdTime: user.createdTime,
-        //     );
-        //   }
-        //   return user;
-        // }).toList();
       }
       emit(UsersLoadedState(users: users));
     } catch (e) {
@@ -128,7 +118,6 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(users);
-      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Asc";
@@ -136,8 +125,12 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
           .toString()
           .toLowerCase()
           .compareTo(b.firstName.toString().toLowerCase()));
-      emit(UsersLoadedState(users: users));
     }
+    currentSortJopTitle = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByNameDesc(
@@ -150,13 +143,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
       emit(UsersLoadingState());
       currentSortOrder = "";
       users = List.from(initialUsers);
-      emit(UsersLoadedState(users: users));
     } else {
       emit(UsersLoadingState());
       currentSortOrder = "Desc";
       users.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-      emit(UsersLoadedState(users: users));
     }
+    currentSortJopTitle = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    emit(UsersLoadedState(users: users));
   }
 
   void _toggleSortUsersByDateNewestToOldest(
@@ -222,6 +218,7 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _searchUsers(
       SearchUsers event, Emitter<UserTableState> emit) async {
     try {
+      emit(TableSearch());
       final query = event.query.toLowerCase();
       final filteredUsers = initialUsers.where((user) {
         final fullName = "${user.firstName} ${user.lastName}".toLowerCase();
@@ -250,7 +247,8 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   }
 
   void _handlePageChange(ChangePage event, Emitter<UserTableState> emit) {
-    const itemsPerPage = 10;
+    currentPage = event.pageNumber;
+    const itemsPerPage = 20;
     final startIndex = (event.pageNumber - 1) * itemsPerPage;
     final endIndex = startIndex + itemsPerPage;
     if (startIndex >= users.length) {
@@ -287,9 +285,15 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
-      currentSortOrder = "";
-    }
+    } else {}
+    currentSortOrder = "";
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    currentSortJopTitle = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
 
     emit(UsersLoadedState(users: filteredUsers));
   }
@@ -311,9 +315,16 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
-      currentSortOrder = "";
-    }
+    } else {}
+    currentSortOrder = "";
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortCreatedBy = '';
+    currentSortRole = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -335,9 +346,15 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
-      currentSortOrder = "";
-    }
+    } else {}
+    currentSortOrder = '';
+    currentSortRole = '';
+    currentSortCreatedDate = '';
+    currentSortStatus = '';
+    currentSortOrderDate = "";
+
+    totalUsersCount = filteredUsers;
+
     emit(UsersLoadedState(users: filteredUsers));
   }
 
@@ -371,14 +388,17 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
     } else if (event.sortOrder == "Desc") {
       currentSortOrder = "Desc";
       filteredUsers.sort((a, b) => b.firstName!.compareTo(a.firstName!));
-    } else {
-      currentSortOrder = "";
-    }
+      totalUsersCount = filteredUsers;
+    } else {}
+    currentSortOrder = '';
+    currentSortRole = '';
+    currentSortCreatedDate = '';
+    currentSortCreatedBy = '';
+    currentSortOrderDate = "";
 
     emit(UsersLoadedState(users: filteredUsers));
   }
 
-
   void _resetAllFilters(Emitter<UserTableState> emit) {
     selectedRoles.clear();
     selectedJobTitles.clear();

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

@@ -9,7 +9,10 @@ final class TableInitial extends UserTableState {
   @override
   List<Object> get props => [];
 }
-
+final class TableSearch extends UserTableState {
+  @override
+  List<Object> get props => [];
+}
 final class RolesLoadingState extends UserTableState {
   @override
   List<Object> get props => [];

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

@@ -25,7 +25,8 @@ class UsersPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final TextEditingController searchController = TextEditingController();
 
-    Widget actionButton({required String title, required Function()? onTap}) {
+    Widget actionButton(
+        {bool isActive = false, required String title, Function()? onTap}) {
       return InkWell(
         onTap: onTap,
         child: Padding(
@@ -33,9 +34,11 @@ class UsersPage extends StatelessWidget {
           child: Text(
             title,
             style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                  color: title == "Delete"
-                      ? ColorsManager.red
-                      : ColorsManager.spaceColor,
+                  color: isActive == false && title != "Delete"
+                      ? Colors.grey
+                      : title == "Delete"
+                          ? ColorsManager.red
+                          : ColorsManager.spaceColor,
                   fontWeight: FontWeight.w400,
                 ),
           ),
@@ -129,9 +132,12 @@ class UsersPage extends StatelessWidget {
                         child: TextFormField(
                           controller: searchController,
                           onChanged: (value) {
-                            context
-                                .read<UserTableBloc>()
-                                .add(SearchUsers(value));
+                            final bloc = context.read<UserTableBloc>();
+                            bloc.add(FilterClearEvent());
+                            bloc.add(SearchUsers(value));
+                            if (value == '') {
+                              bloc.add(ChangePage(1));
+                            }
                           },
                           style: const TextStyle(color: Colors.black),
                           decoration: textBoxDecoration(radios: 15)!.copyWith(
@@ -222,7 +228,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.jobTitle,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortJopTitle,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -233,14 +239,14 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByJobEvent(
                               selectedJob: selectedItems,
-                              sortOrder: _blocRole.currentSortOrder,
+                              sortOrder: _blocRole.currentSortJopTitle,
                             ));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortJopTitle = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortJopTitle = v;
                           },
                         );
                       }
@@ -263,7 +269,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.roleTypes,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortRole,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -275,13 +281,13 @@ class UsersPage extends StatelessWidget {
                             context.read<UserTableBloc>().add(
                                 FilterUsersByRoleEvent(
                                     selectedRoles: selectedItems,
-                                    sortOrder: _blocRole.currentSortOrder));
+                                    sortOrder: _blocRole.currentSortRole));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortRole = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortRole = v;
                           },
                         );
                       }
@@ -319,7 +325,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.createdBy,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortCreatedBy,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -330,13 +336,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByCreatedEvent(
                                 selectedCreatedBy: selectedItems,
-                                sortOrder: _blocRole.currentSortOrder));
+                                sortOrder: _blocRole.currentSortCreatedBy));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortCreatedBy = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortCreatedBy = v;
                           },
                         );
                       }
@@ -359,7 +365,7 @@ class UsersPage extends StatelessWidget {
                           list: _blocRole.status,
                           context: context,
                           checkboxStates: checkboxStates,
-                          isSelected: _blocRole.currentSortOrder,
+                          isSelected: _blocRole.currentSortStatus,
                           onOkPressed: () {
                             searchController.clear();
                             _blocRole.add(FilterClearEvent());
@@ -370,13 +376,13 @@ class UsersPage extends StatelessWidget {
                             Navigator.of(context).pop();
                             _blocRole.add(FilterUsersByDeActevateEvent(
                                 selectedActivate: selectedItems,
-                                sortOrder: _blocRole.currentSortOrder));
+                                sortOrder: _blocRole.currentSortStatus));
                           },
                           onSortAtoZ: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortStatus = v;
                           },
                           onSortZtoA: (v) {
-                            _blocRole.currentSortOrder = v;
+                            _blocRole.currentSortStatus = v;
                           },
                         );
                       }
@@ -441,24 +447,30 @@ class UsersPage extends StatelessWidget {
                         ),
                         Row(
                           children: [
-                            actionButton(
-                              title: "Edit",
-                              onTap: () {
-                                showDialog(
-                                  context: context,
-                                  barrierDismissible: false,
-                                  builder: (BuildContext context) {
-                                    return EditUserDialog(userId: user.uuid);
-                                  },
-                                ).then((v) {
-                                  if (v != null) {
-                                    if (v != null) {
-                                      _blocRole.add(const GetUsers());
-                                    }
-                                  }
-                                });
-                              },
-                            ),
+                            user.isEnabled != false
+                                ? actionButton(
+                                    isActive: true,
+                                    title: "Edit",
+                                    onTap: () {
+                                      showDialog(
+                                        context: context,
+                                        barrierDismissible: false,
+                                        builder: (BuildContext context) {
+                                          return EditUserDialog(
+                                              userId: user.uuid);
+                                        },
+                                      ).then((v) {
+                                        if (v != null) {
+                                          if (v != null) {
+                                            _blocRole.add(const GetUsers());
+                                          }
+                                        }
+                                      });
+                                    },
+                                  )
+                                : actionButton(
+                                    title: "Edit",
+                                  ),
                             actionButton(
                               title: "Delete",
                               onTap: () {
@@ -508,12 +520,11 @@ class UsersPage extends StatelessWidget {
                                 const Icon(Icons.keyboard_double_arrow_right),
                             firstPageIcon:
                                 const Icon(Icons.keyboard_double_arrow_left),
-                            totalPages: (_blocRole.users.length /
+                            totalPages: (_blocRole.totalUsersCount.length /
                                     _blocRole.itemsPerPage)
                                 .ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
-                              _blocRole.currentPage = pageNumber;
                               context
                                   .read<UserTableBloc>()
                                   .add(ChangePage(pageNumber));

lib/pages/roles_and_permission/view/roles_and_permission_page.dart

@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bl
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/users_page.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class RolesAndPermissionPage extends StatelessWidget {
@@ -26,11 +27,10 @@ class RolesAndPermissionPage extends StatelessWidget {
               ? const Center(child: CircularProgressIndicator())
               : WebScaffold(
                   enableMenuSidebar: false,
-                  appBarTitle: FittedBox(
-                    child: Text(
-                      'Roles & Permissions',
-                      style: Theme.of(context).textTheme.headlineLarge,
-                    ),
+                  appBarTitle: Text(
+                    'Roles & Permissions',
+                    style:
+                        ResponsiveTextTheme.of(context).deviceManagementTitle,
                   ),
                   rightBody: const NavigateHomeGridView(),
                   centerBody: Row(

lib/pages/routines/view/routines_view.dart

@@ -33,64 +33,55 @@ class _RoutinesViewState extends State<RoutinesView> {
         return Row(
           children: [
             Expanded(
-                child:
-                    // SideSpacesView(
-                    //   onSelectAction: (String communityId, String spaceId) {
-                    //     // context.read<RoutineBloc>()
-                    //     //   ..add(LoadScenes(spaceId, communityId))
-                    //     //   ..add(LoadAutomation(spaceId));
-                    //   },
-                    // )
-                    SpaceTreeView(
+                child: SpaceTreeView(
               onSelect: () {},
             )),
             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()),
-                      ],
-                    ),
-                  ],
+              flex: 4,
+              child: ListView(children: [
+                Container(
+                  padding: const EdgeInsets.all(16),
+                  height: MediaQuery.sizeOf(context).height,
+                  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: () {
+                          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/space_tree/view/space_tree_view.dart

@@ -10,10 +10,23 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/style.dart';
 
-class SpaceTreeView extends StatelessWidget {
+class SpaceTreeView extends StatefulWidget {
   final Function onSelect;
   const SpaceTreeView({required this.onSelect, super.key});
 
+  @override
+  State<SpaceTreeView> createState() => _SpaceTreeViewState();
+}
+
+class _SpaceTreeViewState extends State<SpaceTreeView> {
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
@@ -21,7 +34,6 @@ class SpaceTreeView extends StatelessWidget {
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: subSectionContainerDecoration,
-        // padding: const EdgeInsets.all(16.0),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
@@ -33,67 +45,150 @@ class SpaceTreeView extends StatelessWidget {
                   ),
                   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,
+                    child: ListView(
+                      shrinkWrap: true,
+                      scrollDirection: Axis.horizontal,
+                      children: [
+                        Container(
+                          width: MediaQuery.sizeOf(context).width * 0.5,
+                          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,
+                                          fontWeight: FontWeight.w400,
+                                        ),
+                                  ),
+                                )
+                              : Scrollbar(
+                                  scrollbarOrientation: ScrollbarOrientation.left,
+                                  thumbVisibility: true,
+                                  controller: _scrollController,
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(left: 16),
+                                    child: ListView(
+                                      controller: _scrollController,
+                                      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));
+                                                widget.onSelect();
+                                              },
+                                              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));
+                                                    widget.onSelect();
+                                                  },
+                                                  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(),
                                     ),
-                              ),
-                            )
-                          : 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));
-
-                                        onSelect();
-                                      },
-                                      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));
-                                            onSelect();
-                                          },
-                                          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(),
-                            ),
+                                  ),
+                                ),
+                        ),
+                      ],
                     ),
                   ),
+
+                  // 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));
+
+                  //                       onSelect();
+                  //                     },
+                  //                     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));
+                  //                           onSelect();
+                  //                         },
+                  //                         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(),
+                  //           ),
+                  //   ),
+                  // ),
                 ],
               ),
       );
@@ -113,7 +208,7 @@ class SpaceTreeView extends StatelessWidget {
           context
               .read<SpaceTreeBloc>()
               .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
-          onSelect();
+          widget.onSelect();
         },
         onExpansionChanged: () {
           context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));

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

@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/spaces_management/structure_selector/view/cent
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
 class SpaceManagementPage extends StatefulWidget {
@@ -36,8 +37,10 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
         ),
       ],
       child: WebScaffold(
-        appBarTitle: Text('Space Management',
-            style: Theme.of(context).textTheme.headlineLarge),
+        appBarTitle: Text(
+          'Space Management',
+          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
+        ),
         enableMenuSidebar: false,
         centerBody: CenterBodyWidget(),
         rightBody: const NavigateHomeGridView(),

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

@@ -42,20 +42,29 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
     _spaceModels = List.from(widget.spaceModels ?? []);
   }
 
+  @override
   @override
   void didUpdateWidget(covariant LoadedSpaceView oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (widget.spaceModels != oldWidget.spaceModels) {
-      setState(() {
-        _spaceModels = List.from(widget.spaceModels ?? []);
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          setState(() {
+            _spaceModels = List.from(widget.spaceModels ?? []);
+          });
+        }
       });
     }
   }
 
   void _onSpaceModelsUpdated(List<SpaceTemplateModel> updatedModels) {
     if (mounted && updatedModels != _spaceModels) {
-      setState(() {
-        _spaceModels = updatedModels;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          setState(() {
+            _spaceModels = updatedModels;
+          });
+        }
       });
     }
   }

lib/pages/spaces_management/assign_tag/bloc/assign_tag_bloc.dart

@@ -4,7 +4,9 @@ import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_e
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart';
 
 class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
-  AssignTagBloc() : super(AssignTagInitial()) {
+  final List<String> allTags;
+
+  AssignTagBloc(this.allTags) : super(AssignTagInitial()) {
     on<InitializeTags>((event, emit) {
       final initialTags = event.initialTags ?? [];
 
@@ -16,25 +18,25 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         }
       }
 
-      final allTags = <Tag>[];
+      final tags = <Tag>[];
 
       for (var selectedProduct in event.addedProducts) {
         final existingCount = existingTagCounts[selectedProduct.productId] ?? 0;
 
         if (selectedProduct.count == 0 ||
             selectedProduct.count <= existingCount) {
-          allTags.addAll(initialTags
+          tags.addAll(initialTags
               .where((tag) => tag.product?.uuid == selectedProduct.productId));
           continue;
         }
 
         final missingCount = selectedProduct.count - existingCount;
 
-        allTags.addAll(initialTags
+        tags.addAll(initialTags
             .where((tag) => tag.product?.uuid == selectedProduct.productId));
 
         if (missingCount > 0) {
-          allTags.addAll(List.generate(
+          tags.addAll(List.generate(
             missingCount,
             (index) => Tag(
               tag: '',
@@ -45,10 +47,14 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         }
       }
 
+      final updatedTags = _calculateAvailableTags(allTags, tags);
+
       emit(AssignTagLoaded(
-          tags: allTags,
-          isSaveEnabled: _validateTags(allTags),
-          errorMessage: ''));
+        tags: tags,
+        updatedTags: updatedTags, 
+        isSaveEnabled: _validateTags(tags),
+        errorMessage: '',
+      ));
     });
 
     on<UpdateTagEvent>((event, emit) {
@@ -56,10 +62,13 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
         final tags = List<Tag>.from(currentState.tags);
-        tags[event.index].tag = event.tag;
+        tags[event.index] = tags[event.index].copyWith(tag: event.tag);
+
+        final updatedTags = _calculateAvailableTags(allTags, tags);
 
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -72,12 +81,15 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
         final tags = List<Tag>.from(currentState.tags);
 
-        // Use copyWith for immutability
+        // Update the location
         tags[event.index] =
             tags[event.index].copyWith(location: event.location);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -92,6 +104,7 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
         emit(AssignTagLoaded(
           tags: tags,
+          updatedTags: _calculateAvailableTags(allTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -102,38 +115,37 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       final currentState = state;
 
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
-        final updatedTags = List<Tag>.from(currentState.tags)
+        final tags = List<Tag>.from(currentState.tags)
           ..remove(event.tagToDelete);
 
+        // Recalculate available tags
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagLoaded(
-          tags: updatedTags,
-          isSaveEnabled: _validateTags(updatedTags),
-          errorMessage: _getValidationError(updatedTags),
+          tags: tags,
+          updatedTags: updatedTags,
+          isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
-      } else {
-        emit(const AssignTagLoaded(
-            tags: [],
-            isSaveEnabled: false,
-            errorMessage: 'Failed to delete tag'));
       }
     });
   }
 
+  // Validate the tags for duplicates or empty values
   bool _validateTags(List<Tag> tags) {
     final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet();
     final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    final isValid = uniqueTags.length == tags.length && !hasEmptyTag;
-    return isValid;
+    return uniqueTags.length == tags.length && !hasEmptyTag;
   }
 
+  // Get validation error for duplicate tags
   String? _getValidationError(List<Tag> tags) {
-    final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    if (hasEmptyTag) {
-      return 'Tags cannot be empty.';
-    }
-
-    final duplicateTags = tags
+    final nonEmptyTags = tags
         .map((tag) => tag.tag?.trim() ?? '')
+        .where((tag) => tag.isNotEmpty)
+        .toList();
+
+    final duplicateTags = nonEmptyTags
         .fold<Map<String, int>>({}, (map, tag) {
           map[tag] = (map[tag] ?? 0) + 1;
           return map;
@@ -149,4 +161,15 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
     return null;
   }
+
+  List<String> _calculateAvailableTags(List<String> allTags, List<Tag> tags) {
+    final selectedTags = tags
+        .where((tag) => (tag.tag?.trim().isNotEmpty ?? false))
+        .map((tag) => tag.tag!.trim())
+        .toSet();
+
+    final availableTags =
+        allTags.where((tag) => !selectedTags.contains(tag.trim())).toList();
+    return availableTags;
+  }
 }

lib/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart

@@ -1,6 +1,5 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
 abstract class AssignTagState extends Equatable {
   const AssignTagState();
@@ -15,17 +14,21 @@ class AssignTagLoading extends AssignTagState {}
 
 class AssignTagLoaded extends AssignTagState {
   final List<Tag> tags;
+  final List<String> updatedTags; 
+
   final bool isSaveEnabled;
-  final String?  errorMessage;
+  final String? errorMessage;
 
   const AssignTagLoaded({
     required this.tags,
     required this.isSaveEnabled,
+    required this.updatedTags,
     required this.errorMessage,
   });
 
   @override
-  List<Object> get props => [tags, isSaveEnabled, errorMessage ?? ''];
+  List<Object> get props =>
+      [tags, updatedTags, isSaveEnabled, errorMessage ?? ''];
 }
 
 class AssignTagError extends AssignTagState {

lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart

@@ -14,6 +14,7 @@ import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_e
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:uuid/uuid.dart';
 
 class AssignTagDialog extends StatelessWidget {
   final List<ProductModel>? products;
@@ -47,7 +48,7 @@ class AssignTagDialog extends StatelessWidget {
       ..add('Main Space');
 
     return BlocProvider(
-      create: (_) => AssignTagBloc()
+      create: (_) => AssignTagBloc(allTags ?? [])
         ..add(InitializeTags(
           initialTags: initialTags,
           addedProducts: addedProducts,
@@ -119,8 +120,6 @@ class AssignTagDialog extends StatelessWidget {
                             : List.generate(state.tags.length, (index) {
                                 final tag = state.tags[index];
                                 final controller = controllers[index];
-                                final availableTags = getAvailableTags(
-                                    allTags ?? [], state.tags, tag);
 
                                 return DataRow(
                                   cells: [
@@ -180,7 +179,9 @@ class AssignTagDialog extends StatelessWidget {
                                           width: double
                                               .infinity, // Ensure full width for dropdown
                                           child: DialogTextfieldDropdown(
-                                            items: availableTags,
+                                            key: ValueKey(
+                                                'dropdown_${Uuid().v4()}_${index}'),
+                                            items: state.updatedTags,
                                             initialValue: tag.tag,
                                             onSelected: (value) {
                                               controller.text = value;
@@ -306,15 +307,4 @@ class AssignTagDialog extends StatelessWidget {
       ),
     );
   }
-
-  List<String> getAvailableTags(
-      List<String> allTags, List<Tag> currentTags, Tag currentTag) {
-    List<String> availableTagsForTagModel = TagHelper.getAvailableTags<Tag>(
-      allTags: allTags,
-      currentTags: currentTags,
-      currentTag: currentTag,
-      getTag: (tag) => tag.tag ?? '',
-    );
-    return availableTagsForTagModel;
-  }
 }

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_bloc.dart

@@ -5,7 +5,9 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model
 
 class AssignTagModelBloc
     extends Bloc<AssignTagModelEvent, AssignTagModelState> {
-  AssignTagModelBloc() : super(AssignTagModelInitial()) {
+  final List<String> allTags;
+
+  AssignTagModelBloc(this.allTags) : super(AssignTagModelInitial()) {
     on<InitializeTagModels>((event, emit) {
       final initialTags = event.initialTags ?? [];
 
@@ -17,25 +19,25 @@ class AssignTagModelBloc
         }
       }
 
-      final allTags = <TagModel>[];
+      final tags = <TagModel>[];
 
       for (var selectedProduct in event.addedProducts) {
         final existingCount = existingTagCounts[selectedProduct.productId] ?? 0;
 
         if (selectedProduct.count == 0 ||
             selectedProduct.count <= existingCount) {
-          allTags.addAll(initialTags
+          tags.addAll(initialTags
               .where((tag) => tag.product?.uuid == selectedProduct.productId));
           continue;
         }
 
         final missingCount = selectedProduct.count - existingCount;
 
-        allTags.addAll(initialTags
+        tags.addAll(initialTags
             .where((tag) => tag.product?.uuid == selectedProduct.productId));
 
         if (missingCount > 0) {
-          allTags.addAll(List.generate(
+          tags.addAll(List.generate(
             missingCount,
             (index) => TagModel(
               tag: '',
@@ -46,9 +48,12 @@ class AssignTagModelBloc
         }
       }
 
+      final updatedTags = _calculateAvailableTags(allTags, tags);
+
       emit(AssignTagModelLoaded(
-          tags: allTags,
-          isSaveEnabled: _validateTags(allTags),
+          tags: tags,
+          updatedTags: updatedTags,
+          isSaveEnabled: _validateTags(tags),
           errorMessage: ''));
     });
 
@@ -57,9 +62,12 @@ class AssignTagModelBloc
       if (currentState is AssignTagModelLoaded &&
           currentState.tags.isNotEmpty) {
         final tags = List<TagModel>.from(currentState.tags);
-        tags[event.index].tag = event.tag;
+        tags[event.index] = tags[event.index].copyWith(tag: event.tag);
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -77,9 +85,13 @@ class AssignTagModelBloc
         tags[event.index] =
             tags[event.index].copyWith(location: event.location);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: updatedTags,
           isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
       }
     });
@@ -93,6 +105,7 @@ class AssignTagModelBloc
 
         emit(AssignTagModelLoaded(
           tags: tags,
+          updatedTags: _calculateAvailableTags(allTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -104,24 +117,22 @@ class AssignTagModelBloc
 
       if (currentState is AssignTagModelLoaded &&
           currentState.tags.isNotEmpty) {
-        final updatedTags = List<TagModel>.from(currentState.tags)
+        final tags = List<TagModel>.from(currentState.tags)
           ..remove(event.tagToDelete);
 
+        final updatedTags = _calculateAvailableTags(allTags, tags);
+
         emit(AssignTagModelLoaded(
-          tags: updatedTags,
-          isSaveEnabled: _validateTags(updatedTags),
+          tags: tags,
+          updatedTags: updatedTags,
+          isSaveEnabled: _validateTags(tags),
+          errorMessage: _getValidationError(tags),
         ));
-      } else {
-        emit(const AssignTagModelLoaded(
-          tags: [],
-          isSaveEnabled: false,
-        ));
-      }
+      } 
     });
   }
 
   bool _validateTags(List<TagModel> tags) {
-    
     final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet();
     final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
     final isValid = uniqueTags.length == tags.length && !hasEmptyTag;
@@ -129,14 +140,14 @@ class AssignTagModelBloc
   }
 
   String? _getValidationError(List<TagModel> tags) {
-    final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
-    if (hasEmptyTag) {
-      return 'Tags cannot be empty.';
-    }
-
     // Check for duplicate tags
-    final duplicateTags = tags
+
+    final nonEmptyTags = tags
         .map((tag) => tag.tag?.trim() ?? '')
+        .where((tag) => tag.isNotEmpty)
+        .toList();
+
+    final duplicateTags = nonEmptyTags
         .fold<Map<String, int>>({}, (map, tag) {
           map[tag] = (map[tag] ?? 0) + 1;
           return map;
@@ -152,4 +163,16 @@ class AssignTagModelBloc
 
     return null;
   }
+
+  List<String> _calculateAvailableTags(
+      List<String> allTags, List<TagModel> tags) {
+    final selectedTags = tags
+        .where((tag) => (tag.tag?.trim().isNotEmpty ?? false))
+        .map((tag) => tag.tag!.trim())
+        .toSet();
+
+    final availableTags =
+        allTags.where((tag) => !selectedTags.contains(tag.trim())).toList();
+    return availableTags;
+  }
 }

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_state.dart

@@ -17,14 +17,17 @@ class AssignTagModelLoaded extends AssignTagModelState {
   final bool isSaveEnabled;
   final String? errorMessage;
 
+  final List<String> updatedTags;
+
   const AssignTagModelLoaded({
     required this.tags,
     required this.isSaveEnabled,
+    required this.updatedTags,
     this.errorMessage,
   });
 
   @override
-  List<Object?> get props => [tags, isSaveEnabled, errorMessage];
+  List<Object?> get props => [tags, updatedTags, isSaveEnabled, errorMessage];
 }
 
 class AssignTagModelError extends AssignTagModelState {

lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart

@@ -16,6 +16,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dialog/c
 import 'package:syncrow_web/pages/spaces_management/tag_model/views/add_device_type_model_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/helper/tag_helper.dart';
+import 'package:uuid/uuid.dart';
 
 class AssignTagModelsDialog extends StatelessWidget {
   final List<ProductModel>? products;
@@ -56,7 +57,7 @@ class AssignTagModelsDialog extends StatelessWidget {
       ..add('Main Space');
 
     return BlocProvider(
-        create: (_) => AssignTagModelBloc()
+        create: (_) => AssignTagModelBloc(allTags ?? [])
           ..add(InitializeTagModels(
             initialTags: initialTags,
             addedProducts: addedProducts,
@@ -134,9 +135,6 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 : List.generate(state.tags.length, (index) {
                                     final tag = state.tags[index];
                                     final controller = controllers[index];
-                                    final availableTags =
-                                        TagHelper.getAvailableTagModels(
-                                            allTags ?? [], state.tags, tag);
 
                                     return DataRow(
                                       cells: [
@@ -196,7 +194,9 @@ class AssignTagModelsDialog extends StatelessWidget {
                                               width: double
                                                   .infinity, // Ensure full width for dropdown
                                               child: DialogTextfieldDropdown(
-                                                items: availableTags,
+                                                 key: ValueKey(
+                                                'dropdown_${Uuid().v4()}_${index}'),
+                                                items: state.updatedTags,
                                                 initialValue: tag.tag,
                                                 onSelected: (value) {
                                                   controller.text = value;

lib/pages/spaces_management/helper/tag_helper.dart

@@ -299,7 +299,7 @@ class TagHelper {
 
   static Map<String, dynamic> updateSubspaceTagModels(
       List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
-    return TagHelper.updateTags<TagModel>(
+    final result = TagHelper.updateTags<TagModel>(
       updatedTags: updatedTags,
       subspaces: subspaces,
       getInternalId: (tag) => tag.internalId,
@@ -310,6 +310,34 @@ class TagHelper {
       setSubspaceTags: (subspace, tags) => subspace.tags = tags,
       checkTagExistInSubspace: checkTagExistInSubspaceModels,
     );
+
+    final processedTags = result['updatedTags'] as List<TagModel>;
+    final processedSubspaces =
+        List<SubspaceTemplateModel>.from(result['subspaces'] as List<dynamic>);
+
+    for (var subspace in processedSubspaces) {
+      final subspaceTags = subspace.tags;
+
+      if (subspaceTags != null) {
+        for (int i = 0; i < subspaceTags.length; i++) {
+          final tag = subspaceTags[i];
+
+          // Find the updated tag inside processedTags
+          final changedTag = updatedTags.firstWhere(
+            (t) => t.internalId == tag.internalId,
+            orElse: () => tag,
+          );
+
+          if (changedTag.tag != tag.tag) {
+            subspaceTags[i] = changedTag.copyWith(tag: changedTag.tag);
+          }
+        }
+      }
+
+      subspace.tags = subspaceTags;
+    }
+
+    return {'updatedTags': processedTags, 'subspaces': processedSubspaces};
   }
 
   static int? checkTagExistInSubspace(Tag tag, List<dynamic>? subspaces) {
@@ -328,7 +356,7 @@ class TagHelper {
 
   static Map<String, dynamic> processTags(
       List<Tag> updatedTags, List<SubspaceModel>? subspaces) {
-    return TagHelper.updateTags<Tag>(
+    final result = TagHelper.updateTags<Tag>(
       updatedTags: updatedTags,
       subspaces: subspaces,
       getInternalId: (tag) => tag.internalId,
@@ -339,6 +367,33 @@ class TagHelper {
       setSubspaceTags: (subspace, tags) => subspace.tags = tags,
       checkTagExistInSubspace: checkTagExistInSubspace,
     );
+
+    final processedTags = result['updatedTags'] as List<Tag>;
+    final processedSubspaces =
+        List<SubspaceModel>.from(result['subspaces'] as List<dynamic>);
+
+    for (var subspace in processedSubspaces) {
+      final subspaceTags = subspace.tags;
+
+      if (subspaceTags != null) {
+        for (int i = 0; i < subspaceTags.length; i++) {
+          final tag = subspaceTags[i];
+
+          final changedTag = updatedTags.firstWhere(
+            (t) => t.internalId == tag.internalId,
+            orElse: () => tag,
+          );
+
+          if (changedTag.tag != tag.tag) {
+            subspaceTags[i] = changedTag.copyWith(tag: changedTag.tag);
+          }
+        }
+      }
+
+      subspace.tags = subspaceTags;
+    }
+
+    return {'updatedTags': processedTags, 'subspaces': processedSubspaces};
   }
 
   static List<String> getAllTagValues(

lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart

@@ -130,14 +130,14 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     SubspaceModelCreate(
                       subspaces: state.space.subspaceModels ?? [],
                       tags: state.space.tags ?? [],
-                      onSpaceModelUpdate: (updatedSubspaces,updatedTags) {
+                      onSpaceModelUpdate: (updatedSubspaces, updatedTags) {
                         context
                             .read<CreateSpaceModelBloc>()
                             .add(AddSubspacesToSpaceTemplate(updatedSubspaces));
-                        if(updatedTags!=null){
+                        if (updatedTags != null) {
                           context
-                            .read<CreateSpaceModelBloc>()
-                            .add(AddTagsToSpaceTemplate(updatedTags));
+                              .read<CreateSpaceModelBloc>()
+                              .add(AddTagsToSpaceTemplate(updatedTags));
                         }
                       },
                     ),

lib/services/user_permission.dart

@@ -34,9 +34,8 @@ class UserPermissionApi {
       path: ApiEndpoints.roleTypes,
       showServerMessage: true,
       expectedResponseModel: (json) {
-        final List<RoleTypeModel> fetchedRoles = (json['data'] as List)
-            .map((item) => RoleTypeModel.fromJson(item))
-            .toList();
+        final List<RoleTypeModel> fetchedRoles =
+            (json['data'] as List).map((item) => RoleTypeModel.fromJson(item)).toList();
         return fetchedRoles;
       },
     );
@@ -48,9 +47,7 @@ class UserPermissionApi {
       path: ApiEndpoints.permission.replaceAll("roleUuid", roleUuid),
       showServerMessage: true,
       expectedResponseModel: (json) {
-        return (json as List)
-            .map((data) => PermissionOption.fromJson(data))
-            .toList();
+        return (json as List).map((data) => PermissionOption.fromJson(data)).toList();
       },
     );
     return response ?? [];
@@ -88,7 +85,6 @@ class UserPermissionApi {
           }
         },
       );
-      print('sendInviteUser=$body');
 
       return response ?? [];
     } on DioException catch (e) {
@@ -196,12 +192,9 @@ class UserPermissionApi {
         "disable": status,
         "projectUuid": "0e62577c-06fa-41b9-8a92-99a21fbaf51c"
       };
-      print('changeUserStatusById==$bodya');
-      print('changeUserStatusById==$userUuid');
 
       final response = await _httpService.put(
-        path: ApiEndpoints.changeUserStatus
-            .replaceAll("{invitedUserUuid}", userUuid),
+        path: ApiEndpoints.changeUserStatus.replaceAll("{invitedUserUuid}", userUuid),
         body: bodya,
         expectedResponseModel: (json) {
           return json['success'];

lib/utils/responsive_layout.dart

@@ -1,18 +1,37 @@
 import 'package:flutter/material.dart';
 
 class ResponsiveLayout extends StatelessWidget {
-  final Widget desktopBody;
   final Widget mobileBody;
-  const ResponsiveLayout(
-      {super.key, required this.desktopBody, required this.mobileBody});
+  final Widget? tablet;
+  final Widget desktopBody;
+
+  const ResponsiveLayout({
+    super.key,
+    required this.mobileBody,
+    this.tablet,
+    required this.desktopBody,
+  });
+
+  static bool isMobile(BuildContext context) =>
+      MediaQuery.of(context).size.width < 650;
+
+  static bool isTablet(BuildContext context) =>
+      MediaQuery.of(context).size.width < 1100 &&
+      MediaQuery.of(context).size.width >= 650;
+
+  static bool isDesktop(BuildContext context) =>
+      MediaQuery.of(context).size.width >= 1100;
+
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(
       builder: (context, constraints) {
-        if (constraints.maxWidth < 600) {
-          return mobileBody;
-        } else {
+        if (constraints.maxWidth >= 1100) {
           return desktopBody;
+        } else if (constraints.maxWidth >= 650) {
+          return tablet!;
+        } else {
+          return mobileBody;
         }
       },
     );

lib/utils/theme/responsive_text_theme.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/responsive_layout.dart';
+
+class ResponsiveTextTheme extends ThemeExtension<ResponsiveTextTheme> {
+  final TextStyle deviceManagementTitle;
+
+  ResponsiveTextTheme({
+    required this.deviceManagementTitle,
+  });
+
+  @override
+  ThemeExtension<ResponsiveTextTheme> copyWith() => this;
+
+  @override
+  ThemeExtension<ResponsiveTextTheme> lerp(
+          ThemeExtension<ResponsiveTextTheme>? other, double t) =>
+      this;
+
+  static ResponsiveTextTheme of(BuildContext context) {
+    final isMobile = ResponsiveLayout.isMobile(context);
+    return Theme.of(context).extension<ResponsiveTextTheme>() ??
+        ResponsiveTextTheme(
+          deviceManagementTitle: TextStyle(
+              fontSize: isMobile ? 20 : 30,
+              fontWeight: FontWeight.w700,
+              color: ColorsManager.whiteColors),
+        );
+  }
+}

lib/web_layout/web_app_bar.dart

@@ -5,10 +5,10 @@ import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+import 'package:syncrow_web/utils/responsive_layout.dart';
 import 'package:syncrow_web/utils/user_drop_down_menu.dart';
 
-class WebAppBar extends StatefulWidget {
+class WebAppBar extends StatelessWidget {
   final Widget? title;
   final Widget? centerBody;
   final Widget? rightBody;
@@ -16,178 +16,234 @@ class WebAppBar extends StatefulWidget {
   const WebAppBar({super.key, this.title, this.centerBody, this.rightBody});
 
   @override
-  State<WebAppBar> createState() => _WebAppBarState();
+  Widget build(BuildContext context) {
+    return BlocBuilder<HomeBloc, HomeState>(
+      builder: (context, state) {
+        final user = context.read<HomeBloc>().user;
+        return ResponsiveLayout(
+          mobileBody: MobileAppBar(
+            title: title,
+            centerBody: centerBody,
+            rightBody: rightBody,
+            user: user,
+          ),
+          tablet: TabletAppBar(
+            title: title,
+            centerBody: centerBody,
+            rightBody: rightBody,
+            user: user,
+          ),
+          desktopBody: DesktopAppBar(
+            title: title,
+            centerBody: centerBody,
+            rightBody: rightBody,
+            user: user,
+          ),
+        );
+      },
+    );
+  }
 }
 
-class _WebAppBarState extends State<WebAppBar> with HelperResponsiveLayout {
-  @override
-  void initState() {
-    super.initState();
-  }
+class DesktopAppBar extends StatelessWidget {
+  final Widget? title;
+  final Widget? centerBody;
+  final Widget? rightBody;
+  final dynamic user;
+
+  const DesktopAppBar({
+    super.key,
+    this.title,
+    this.centerBody,
+    this.rightBody,
+    required this.user,
+  });
 
   @override
   Widget build(BuildContext context) {
-    bool isSmallScreen = isSmallScreenSize(context);
-    bool isHalfMediumScreen = isHafMediumScreenSize(context);
-    return BlocBuilder<HomeBloc, HomeState>(builder: (context, state) {
-      final user = context.read<HomeBloc>().user;
-      return Container(
-        height: (isSmallScreen || isHalfMediumScreen) ? 130 : 100,
-        decoration: const BoxDecoration(color: ColorsManager.secondaryColor),
-        padding: const EdgeInsets.all(10),
-        child: isSmallScreen || isHalfMediumScreen
-            ? Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  if (widget.title != null)
-                    Align(
-                      alignment: Alignment.centerLeft,
-                      child: widget.title!,
-                    ),
-                  if (widget.centerBody != null)
-                    Padding(
-                      padding: const EdgeInsets.only(top: 8.0),
-                      child: widget.centerBody,
-                    ),
-                  if (widget.rightBody != null || user != null)
-                    Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        if (widget.rightBody != null) widget.rightBody!,
-                        Row(
-                          children: [
-                            SizedBox.square(
-                              dimension: 40,
-                              child: CircleAvatar(
-                                backgroundColor: ColorsManager.whiteColors,
-                                child: SizedBox.square(
-                                  dimension: 35,
-                                  child: SvgPicture.asset(
-                                    Assets.logoGrey,
-                                    fit: BoxFit.cover,
-                                  ),
-                                ),
-                              ),
-                            ),
-                            const SizedBox(
-                              width: 10,
-                            ),
-                            if (user != null)
-                              Text(
-                                '${user.firstName} ${user.lastName}',
-                                style: Theme.of(context).textTheme.bodyLarge,
-                              ),
-                          ],
-                        ),
-                      ],
-                    ),
-                ],
-              )
-            : Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Expanded(
-                    child: Row(
-                      children: [
-                        widget.title!,
-                        if (widget.centerBody != null)
-                          Padding(
-                            padding: const EdgeInsets.only(left: 80),
-                            child: widget.centerBody!,
-                          ),
-                      ],
-                    ),
+    return Container(
+      height: 100,
+      decoration: const BoxDecoration(color: ColorsManager.secondaryColor),
+      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 10),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Expanded(
+            child: Row(
+              children: [
+                if (title != null) title!,
+                if (centerBody != null)
+                  Padding(
+                    padding: const EdgeInsets.only(left: 80),
+                    child: centerBody!,
                   ),
-                  Row(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      if (widget.rightBody != null)
-                        Align(
-                          alignment: Alignment.centerRight,
-                          child: widget.rightBody,
-                        ),
-                      const SizedBox(
-                        width: 10,
-                      ),
-                      SizedBox.square(
-                        dimension: 40,
-                        child: CircleAvatar(
-                          backgroundColor: ColorsManager.whiteColors,
-                          child: SizedBox.square(
-                            dimension: 35,
-                            child: SvgPicture.asset(
-                              Assets.logoGrey,
-                              fit: BoxFit.cover,
-                            ),
-                          ),
-                        ),
-                      ),
-                      const SizedBox(
-                        width: 10,
-                      ),
-                      if (user != null)
-                        Text(
-                          '${user.firstName} ${user.lastName}',
-                          style: Theme.of(context).textTheme.bodyLarge,
-                        ),
-                      const SizedBox(
-                        width: 10,
-                      ),
-                      UserDropdownMenu(user: user),
-                      // GestureDetector(
-                      //   onTap: () {
-                      //     showCustomDialog(
-                      //       context: context,
-                      //       barrierDismissible: true,
-                      //       title: 'Logout',
-                      //       message: 'Are you sure you want to logout?',
-                      //       actions: [
-                      //         GestureDetector(
-                      //           onTap: () {
-                      //             AuthBloc.logout();
-                      //             context.go(RoutesConst.auth);
-                      //           },
-                      //           child: DefaultButton(
-                      //             child: Text(
-                      //               'Ok',
-                      //               style: Theme.of(context)
-                      //                   .textTheme
-                      //                   .bodyMedium!
-                      //                   .copyWith(fontSize: 12, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //         ),
-                      //         const SizedBox(
-                      //           height: 10,
-                      //         ),
-                      //         GestureDetector(
-                      //           onTap: () {
-                      //             context.pop();
-                      //           },
-                      //           child: DefaultButton(
-                      //             child: Text(
-                      //               'Cancel',
-                      //               style: Theme.of(context)
-                      //                   .textTheme
-                      //                   .bodyMedium!
-                      //                   .copyWith(fontSize: 12, color: Colors.white),
-                      //             ),
-                      //           ),
-                      //         ),
-                      //       ],
-                      //     );
-                      //   },
-                      //   child: const Icon(
-                      //     Icons.logout,
-                      //     color: ColorsManager.whiteColors,
-                      //   ),
-                      // )
-                    ],
-                  ),
-                ],
-              ),
-      );
-    });
+              ],
+            ),
+          ),
+          _buildUserSection(context),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildUserSection(BuildContext context) {
+    return Row(
+      children: [
+        if (rightBody != null) rightBody!,
+        const SizedBox(width: 24),
+        _UserAvatar(),
+        const SizedBox(width: 12),
+        if (user != null)
+          Text(
+            '${user.firstName} ${user.lastName}',
+            style: Theme.of(context).textTheme.bodyLarge,
+          ),
+        const SizedBox(width: 12),
+        UserDropdownMenu(user: user),
+      ],
+    );
+  }
+}
+
+class TabletAppBar extends StatelessWidget {
+  final Widget? title;
+  final Widget? centerBody;
+  final Widget? rightBody;
+  final dynamic user;
+
+  const TabletAppBar({
+    super.key,
+    this.title,
+    this.centerBody,
+    this.rightBody,
+    required this.user,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 100,
+      decoration: const BoxDecoration(color: ColorsManager.secondaryColor),
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+      child: Column(
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              if (title != null) Expanded(child: title!),
+              _buildUserSection(context),
+            ],
+          ),
+          if (centerBody != null) Expanded(child: centerBody!),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildUserSection(BuildContext context) {
+    return Row(
+      children: [
+        if (rightBody != null) rightBody!,
+        const SizedBox(width: 16),
+        _UserAvatar(),
+        if (user != null) ...[
+          const SizedBox(width: 8),
+          Text(
+            '${user.firstName} ${user.lastName}',
+            style:
+                Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
+          ),
+        ],
+        UserDropdownMenu(user: user),
+      ],
+    );
+  }
+}
+
+class MobileAppBar extends StatelessWidget {
+  final Widget? title;
+  final Widget? centerBody;
+  final Widget? rightBody;
+  final dynamic user;
+
+  const MobileAppBar({
+    super.key,
+    this.title,
+    this.centerBody,
+    this.rightBody,
+    required this.user,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 135,
+      decoration: const BoxDecoration(color: ColorsManager.secondaryColor),
+      padding: const EdgeInsets.all(12),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              if (title != null) title!,
+              _buildUserSection(context),
+            ],
+          ),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              if (centerBody != null)
+                Padding(
+                  padding: const EdgeInsets.only(top: 8),
+                  child: centerBody!,
+                ),
+              if (rightBody != null)
+                Padding(
+                  padding: const EdgeInsets.only(top: 8),
+                  child: rightBody!,
+                ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildUserSection(BuildContext context) {
+    return Row(
+      children: [
+        _UserAvatar(),
+        if (user != null) ...[
+          const SizedBox(width: 8),
+          Text(
+            '${user.firstName} ${user.lastName}',
+            style:
+                Theme.of(context).textTheme.bodyLarge?.copyWith(fontSize: 14),
+          ),
+        ],
+        UserDropdownMenu(user: user),
+      ],
+    );
+  }
+}
+
+class _UserAvatar extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox.square(
+      dimension: 40,
+      child: CircleAvatar(
+        backgroundColor: ColorsManager.whiteColors,
+        child: SizedBox.square(
+          dimension: 35,
+          child: SvgPicture.asset(
+            Assets.logoGrey,
+            fit: BoxFit.cover,
+          ),
+        ),
+      ),
+    );
   }
 }

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,12 +5,20 @@
 import FlutterMacOS
 import Foundation
 
+import firebase_analytics
+import firebase_core
+import firebase_crashlytics
+import firebase_database
 import flutter_secure_storage_macos
 import path_provider_foundation
 import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FLTFirebaseAnalyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAnalyticsPlugin"))
+  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
+  FLTFirebaseCrashlyticsPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCrashlyticsPlugin"))
+  FLTFirebaseDatabasePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseDatabasePlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

macos/Runner.xcodeproj/project.pbxproj

@@ -22,6 +22,7 @@
 
 /* Begin PBXBuildFile section */
 		108157F896CD9F637B06D7C0 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DAF1C60594A51D692304366 /* Pods_Runner.framework */; };
+		2901225E5FAB0C696EE79F77 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 996A2A515D007C9FED5396A5 /* GoogleService-Info.plist */; };
 		2D0F1F294F673EF0DB5E4CA1 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E148CBDFFE42BF88E8C34DE0 /* Pods_RunnerTests.framework */; };
 		331C80D8294CF71000263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C80D7294CF71000263BE5 /* RunnerTests.swift */; };
 		335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; };
@@ -84,6 +85,7 @@
 		81F2F315AC5109F6F5D27BE6 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		96C46007EE0A4E9E1D6D74CE /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+		996A2A515D007C9FED5396A5 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		A604E311B663FBF4B7C54DC5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		AB949539E0D0A8E2BDAB9ADF /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		E148CBDFFE42BF88E8C34DE0 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -138,6 +140,7 @@
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
 				75DCDFECC7757C5159E8F0C5 /* Pods */,
+				996A2A515D007C9FED5396A5 /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -241,6 +244,7 @@
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
 				92D754792F50A5D35F6D5AEE /* [CP] Embed Pods Frameworks */,
+				7E188D2155D07A3E9E027C0F /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
 			);
 			buildRules = (
 			);
@@ -317,6 +321,7 @@
 			files = (
 				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
 				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
+				2901225E5FAB0C696EE79F77 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -361,6 +366,24 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
+		7E188D2155D07A3E9E027C0F /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\n#!/bin/bash\nPATH=\"${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\"\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\" --platform=macos --apple-project-path=\"${SRCROOT}\" --env-platform-name=\"${PLATFORM_NAME}\" --env-configuration=\"${CONFIGURATION}\" --env-project-dir=\"${PROJECT_DIR}\" --env-built-products-dir=\"${BUILT_PRODUCTS_DIR}\" --env-dwarf-dsym-folder-path=\"${DWARF_DSYM_FOLDER_PATH}\" --env-dwarf-dsym-file-name=\"${DWARF_DSYM_FILE_NAME}\" --env-infoplist-path=\"${INFOPLIST_PATH}\" --default-config=default\n";
+		};
 		8ECFD939A4D371A145DBA191 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

macos/Runner/GoogleService-Info.plist

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyABnpH6yo2RRjtkp4PlvtK84hKwRm2DhBw</string>
+	<key>GCM_SENDER_ID</key>
+	<string>427332280600</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.example.syncrowWeb</string>
+	<key>PROJECT_ID</key>
+	<string>test2-8a3d2</string>
+	<key>STORAGE_BUCKET</key>
+	<string>test2-8a3d2.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:427332280600:ios:14346b200780dc760c7e6d</string>
+	<key>DATABASE_URL</key>
+	<string>https://test2-8a3d2-default-rtdb.firebaseio.com</string>
+</dict>
+</plist>

pubspec.lock

@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _flutterfire_internals:
+    dependency: transitive
+    description:
+      name: _flutterfire_internals
+      sha256: e051259913915ea5bc8fe18664596bea08592fd123930605d562969cd7315fcd
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.51"
   args:
     dependency: transitive
     description:
@@ -153,6 +161,94 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
+  firebase_analytics:
+    dependency: "direct main"
+    description:
+      name: firebase_analytics
+      sha256: "47428047a0778f72af53a3c7cb5d556e1cb25e2327cc8aa40d544971dc6245b2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.4.2"
+  firebase_analytics_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_analytics_platform_interface
+      sha256: "1076f4b041f76143e14878c70f0758f17fe5910c0cd992db9e93bd3c3584512b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.2"
+  firebase_analytics_web:
+    dependency: transitive
+    description:
+      name: firebase_analytics_web
+      sha256: "8f6dd64ea6d28b7f5b9e739d183a9e1c7f17027794a3e9aba1879621d42426ef"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.10+8"
+  firebase_core:
+    dependency: "direct main"
+    description:
+      name: firebase_core
+      sha256: "93dc4dd12f9b02c5767f235307f609e61ed9211047132d07f9e02c668f0bfc33"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.11.0"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.4.0"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      sha256: "0e13c80f0de8acaa5d0519cbe23c8b4cc138a2d5d508b5755c861bdfc9762678"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.20.0"
+  firebase_crashlytics:
+    dependency: "direct main"
+    description:
+      name: firebase_crashlytics
+      sha256: "6273ed71bcd8a6fb4d0ca13d3abddbb3301796807efaad8782b5f90156f26f03"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.2"
+  firebase_crashlytics_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_crashlytics_platform_interface
+      sha256: "94f3986e1a10e5a883f2ad5e3d719aef98a8a0f9a49357f6e45b7d3696ea6a97"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.8.2"
+  firebase_database:
+    dependency: "direct main"
+    description:
+      name: firebase_database
+      sha256: cd2354dfef68e52c0713b5efbb7f4e10dfc2aff2f945c7bc8db34d1934170627
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.3.2"
+  firebase_database_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_database_platform_interface
+      sha256: d430983f4d877c9f72f88b3d715cca9a50021dd7ccd8e3ae6fb79603853317de
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.6+2"
+  firebase_database_web:
+    dependency: transitive
+    description:
+      name: firebase_database_web
+      sha256: f64edae62c5beaa08e9e611a0736d64ab11a812983a0aa132695d2d191311ea7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.6+8"
   fixnum:
     dependency: transitive
     description:
@@ -572,10 +668,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "3a293170d4d9403c3254ee05b84e62e8a9b3c5808ebd17de6a33fe9ea6457936"
+      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.2"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -777,10 +873,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "1.1.0"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -56,6 +56,11 @@ dependencies:
   number_pagination: ^1.1.6
   url_launcher: ^6.2.5
   flutter_html: ^3.0.0-beta.2
+  firebase_analytics: ^11.4.0
+  firebase_core: ^3.11.0
+  firebase_crashlytics: ^4.3.2
+  firebase_database: ^11.3.2
+
 
 dev_dependencies:
   flutter_test:

web/index.html

@@ -40,6 +40,8 @@
   <script src="flutter.js" defer></script>
 </head>
 <body>
+  <script src="https://www.gstatic.com/firebasejs/8.10.0/firebase-app.js"></script>
+
   <script>
     window.addEventListener('load', function(ev) {
       // Download main.dart.js
@@ -54,6 +56,20 @@
         }
       });
     });
+
+
+var firebaseConfig = {
+  apiKey: "AIzaSyCVEvKsJYzhWDFM-9Od68FE0nPpP933st0",
+  authDomain: "test2-8a3d2.firebaseapp.com",
+  databaseURL: "https://test2-8a3d2-default-rtdb.firebaseio.com",
+  projectId: "test2-8a3d2",
+  storageBucket: "test2-8a3d2.firebasestorage.app",
+  messagingSenderId: "427332280600",
+  appId: "1:427332280600:web:ad50516a87a35a1a0c7e6d",
+  measurementId: "G-Z1RTTTV5H9"
+};
+firebase.initializeApp(firebaseConfig);
+
   </script>
 </body>
 </html>

windows/flutter/generated_plugin_registrant.cc

@@ -6,10 +6,13 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <firebase_core/firebase_core_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  FirebaseCorePluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   UrlLauncherWindowsRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  firebase_core
   flutter_secure_storage_windows
   url_launcher_windows
 )