Fixed cursor issue

Merge pull request #95 from SyncrowIOT/bugfix/change-endpoint-prod
fix endpoints
2025-07-11 07:38:05 +00:00 · 2025-02-20 11:34:24 +04:00 · 2025-02-19 18:01:11 +04:00 · 2025-02-19 17:58:53 +04:00 · 2025-02-18 16:27:09 +03:00 · 2025-02-18 16:25:33 +03:00
44 changed files with 556 additions and 547 deletions
--- a/lib/common/dialog_textfield_dropdown.dart
+++ b/lib/common/dialog_textfield_dropdown.dart
@ -20,15 +20,22 @@ class DialogTextfieldDropdown extends StatefulWidget {

 class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
  bool _isOpen = false;
-  late OverlayEntry _overlayEntry;
+  OverlayEntry? _overlayEntry;
  final TextEditingController _controller = TextEditingController();
-  late List<String> _filteredItems; // Filtered items list
+  final FocusNode _focusNode = FocusNode();
+  List<String> _filteredItems = [];

  @override
  void initState() {
    super.initState();
-    _controller.text = widget.initialValue ?? 'Select Tag';
-    _filteredItems = List.from(widget.items); // Initialize filtered items
+    _controller.text = widget.initialValue ?? '';
+    _filteredItems = List.from(widget.items);
+
+    _focusNode.addListener(() {
+      if (!_focusNode.hasFocus) {
+        _closeDropdown();
+      }
+    });
  }

  void _toggleDropdown() {
@ -41,13 +48,16 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {

  void _openDropdown() {
    _overlayEntry = _createOverlayEntry();
-    Overlay.of(context).insert(_overlayEntry);
+    Overlay.of(context).insert(_overlayEntry!);
    _isOpen = true;
  }

  void _closeDropdown() {
-    _overlayEntry.remove();
-    _isOpen = false;
+    if (_isOpen && _overlayEntry != null) {
+      _overlayEntry!.remove();
+      _overlayEntry = null;
+      _isOpen = false;
+    }
  }

  OverlayEntry _createOverlayEntry() {
@ -58,9 +68,7 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
    return OverlayEntry(
      builder: (context) {
        return GestureDetector(
-          onTap: () {
-            _closeDropdown();
-          },
+          onTap: _closeDropdown,
          behavior: HitTestBehavior.translucent,
          child: Stack(
            children: [
@ -72,40 +80,29 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
                  elevation: 4.0,
                  child: Container(
                    color: ColorsManager.whiteColors,
-                    constraints: const BoxConstraints(
-                      maxHeight: 200.0,
-                    ),
-                    child: ListView.builder(
-                      shrinkWrap: true,
-                      itemCount: _filteredItems.length,
-                      itemBuilder: (context, index) {
-                        final item = _filteredItems[index];
-                        return Container(
-                          decoration: const BoxDecoration(
-                            border: Border(
-                              bottom: BorderSide(
-                                color: ColorsManager.lightGrayBorderColor,
-                                width: 1.0,
-                              ),
-                            ),
-                          ),
-                          child: ListTile(
-                            title: Text(item,
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodyMedium
-                                    ?.copyWith(
-                                        color: ColorsManager.textPrimaryColor)),
-                            onTap: () {
-                              _controller.text = item;
-                              widget.onSelected(item);
-                              setState(() {
-                                _filteredItems
-                                    .remove(item); // Remove selected item
-                              });
-                              _closeDropdown();
-                            },
-                          ),
+                    constraints: const BoxConstraints(maxHeight: 200.0),
+                    child: StatefulBuilder(
+                      builder: (context, setStateDropdown) {
+                        return ListView.builder(
+                          shrinkWrap: true,
+                          itemCount: _filteredItems.length,
+                          itemBuilder: (context, index) {
+                            final item = _filteredItems[index];
+                            return ListTile(
+                              title: Text(item,
+                                  style: Theme.of(context)
+                                      .textTheme
+                                      .bodyMedium
+                                      ?.copyWith(
+                                          color:
+                                              ColorsManager.textPrimaryColor)),
+                              onTap: () {
+                                _controller.text = item;
+                                widget.onSelected(item);
+                                _closeDropdown();
+                              },
+                            );
+                          },
                        );
                      },
                    ),
@ -122,7 +119,8 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
  @override
  Widget build(BuildContext context) {
    return GestureDetector(
-      onTap: _toggleDropdown,
+      onTap: () => FocusScope.of(context).unfocus(),
+      behavior: HitTestBehavior.opaque,
      child: Container(
        padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
        decoration: BoxDecoration(
@ -135,23 +133,26 @@ class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
            Expanded(
              child: TextFormField(
                controller: _controller,
-                onChanged: (value) {
-                  setState(() {
-                    _filteredItems = widget.items
-                        .where((item) =>
-                            item.toLowerCase().contains(value.toLowerCase()))
-                        .toList(); // Filter items dynamically
-                  });
+                focusNode: _focusNode,
+                onFieldSubmitted: (value) {
                  widget.onSelected(value);
+                  _closeDropdown();
+                },
+                onTapOutside: (event) {
+                  widget.onSelected(_controller.text);
+                  _closeDropdown();
                },
                style: Theme.of(context).textTheme.bodyMedium,
                decoration: const InputDecoration(
-                  hintText: 'Enter or Select tag',
+                  hintText: 'Enter or Select a tag',
                  border: InputBorder.none,
                ),
              ),
            ),
-            const Icon(Icons.arrow_drop_down),
+            GestureDetector(
+              onTap: _toggleDropdown,
+              child: const Icon(Icons.arrow_drop_down),
+            ),
          ],
        ),
      ),
--- a/lib/common/widgets/search_bar.dart
+++ b/lib/common/widgets/search_bar.dart
@ -3,18 +3,33 @@ import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';

-class CustomSearchBar extends StatelessWidget {
+class CustomSearchBar extends StatefulWidget {
  final TextEditingController? controller;
  final String hintText;
+  final String? searchQuery;
  final Function(String)? onSearchChanged; // Callback for search input changes

  const CustomSearchBar({
    super.key,
    this.controller,
+    this.searchQuery = '',
    this.hintText = 'Search',
    this.onSearchChanged,
  });

+  @override
+  State<CustomSearchBar> createState() => _CustomSearchBarState();
+}
+
+class _CustomSearchBarState extends State<CustomSearchBar> {
+  @override
+  void dispose() {
+    if (widget.controller != null) {
+      widget.controller!.dispose();
+    }
+    super.dispose();
+  }
+
  @override
  Widget build(BuildContext context) {
    return Container(
@ -36,16 +51,17 @@ class CustomSearchBar extends StatelessWidget {
        decoration: BoxDecoration(
          borderRadius: BorderRadius.circular(12),
        ),
-        child: TextField(
-          controller: controller,
+        child: TextFormField(
+          controller: widget.controller,
+          initialValue: widget.searchQuery,
          style: const TextStyle(
            color: Colors.black,
          ),
-          onChanged: onSearchChanged, // Call the callback on text change
+          onChanged: widget.onSearchChanged, // Call the callback on text change
          decoration: InputDecoration(
            filled: true,
            fillColor: ColorsManager.textFieldGreyColor,
-            hintText: hintText,
+            hintText: widget.hintText,
            hintStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
                  color: ColorsManager.lightGrayColor,
                  fontSize: 12,
--- a/lib/common/widgets/spaces_side_tree.dart
+++ b/lib/common/widgets/spaces_side_tree.dart
@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-
-class SpacesSideTree extends StatefulWidget {
-  final List<CommunityModel> communities;
-  final String? selectedSpaceUuid;
-  const SpacesSideTree({
-    super.key,
-    required this.communities,
-    this.selectedSpaceUuid,
-  });
-
-  @override
-  State<SpacesSideTree> createState() => _SpacesSideTreeState();
-}
-
-class _SpacesSideTreeState extends State<SpacesSideTree> {
-  String _searchQuery = '';
-  String? _selectedSpaceUuid;
-  String? _selectedId;
-  @override
-  Widget build(BuildContext context) {
-    return const Placeholder();
-  }
-}
--- a/lib/main.dart
+++ b/lib/main.dart
@ -2,10 +2,8 @@ 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:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.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';
@ -15,25 +13,22 @@ import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.da
 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/navigation_service.dart';
 import 'package:syncrow_web/utils/theme/theme.dart';

 Future<void> main() async {
  try {
-    const environment =
-        String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
    await dotenv.load(fileName: '.env.$environment');
    WidgetsFlutterBinding.ensureInitialized();
    initialSetup();
  } catch (_) {}
-  final storage = FlutterSecureStorage();
-  final projectCubit = ProjectCubit(storage);
-  runApp(MyApp(projectCubit: projectCubit));
+  runApp(MyApp());
 }

 class MyApp extends StatelessWidget {
-  final ProjectCubit projectCubit;

-  MyApp({super.key, required this.projectCubit});
+  MyApp({super.key});

  final GoRouter _router = GoRouter(
    initialLocation: RoutesConst.auth,
@ -54,17 +49,15 @@ class MyApp extends StatelessWidget {
  Widget build(BuildContext context) {
    return MultiBlocProvider(
        providers: [
-          BlocProvider(create: (context) => projectCubit),
-          BlocProvider(
-              create: (context) => HomeBloc(projectCubit)..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
          BlocProvider<VisitorPasswordBloc>(
-            create: (context) => VisitorPasswordBloc(projectCubit),
+            create: (context) => VisitorPasswordBloc(),
          ),
          BlocProvider<RoutineBloc>(
-            create: (context) => RoutineBloc(projectCubit),
+            create: (context) => RoutineBloc(),
          ),
          BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc(projectCubit)..add(InitialEvent()),
+            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
          ),
        ],
        child: MaterialApp.router(
@ -77,6 +70,8 @@ class MyApp extends StatelessWidget {
              PointerDeviceKind.unknown,
            },
          ),
+          key: NavigationService.navigatorKey,
+          // scaffoldMessengerKey: NavigationService.snackbarKey,
          theme: myTheme,
          routerConfig: _router,
        ));
--- a/lib/pages/access_management/bloc/access_bloc.dart
+++ b/lib/pages/access_management/bloc/access_bloc.dart
@ -3,18 +3,18 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
 import 'package:syncrow_web/pages/access_management/model/password_model.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/hour_picker_dialog.dart';
 import 'package:syncrow_web/services/access_mang_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/app_enum.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';

 class AccessBloc extends Bloc<AccessEvent, AccessState> {
-  final ProjectCubit projectCubit;
-
-  AccessBloc(this.projectCubit) : super((AccessInitial())) {
+  AccessBloc() : super((AccessInitial())) {
    on<FetchTableData>(_onFetchTableData);
    on<SelectTime>(selectTime);
    on<FilterDataEvent>(_filterData);
@ -34,10 +34,9 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
  Future<void> _onFetchTableData(
      FetchTableData event, Emitter<AccessState> emit) async {
    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
      emit(AccessLoaded());
-      data = await AccessMangApi()
-          .fetchVisitorPassword(projectUuid ?? TempConst.projectId);
+      data = await AccessMangApi().fetchVisitorPassword(projectUuid);
      filteredData = data;
      updateTabsCount();
      emit(TableLoaded(data));
--- a/lib/pages/access_management/view/access_management.dart
+++ b/lib/pages/access_management/view/access_management.dart
@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/common/buttons/search_reset_buttons.dart';
 import 'package:syncrow_web/pages/common/custom_table.dart';
@ -28,7 +28,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
    final isLargeScreen = isLargeScreenSize(context);
    final isSmallScreen = isSmallScreenSize(context);
    final isHalfMediumScreen = isHafMediumScreenSize(context);
-    final padding = isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
+    final padding =
+        isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);

    return WebScaffold(
        enableMenuSidebar: false,
@ -40,7 +41,8 @@ class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
        ),
        rightBody: const NavigateHomeGridView(),
        scaffoldBody: BlocProvider(
-            create: (BuildContext context) => AccessBloc(context.read<ProjectCubit>())..add(FetchTableData()),
+            create: (BuildContext context) =>
+                AccessBloc()..add(FetchTableData()),
            child: BlocConsumer<AccessBloc, AccessState>(
                listener: (context, state) {},
                builder: (context, state) {
@ -94,11 +96,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(),
@ -109,7 +114,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,
@ -135,7 +141,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(
@ -173,8 +180,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));
@ -192,8 +201,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));
@ -222,7 +233,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));
@ -250,8 +262,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));
@ -275,7 +289,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));
--- a/lib/pages/auth/bloc/auth_bloc.dart
+++ b/lib/pages/auth/bloc/auth_bloc.dart
@ -9,7 +9,7 @@ import 'package:syncrow_web/pages/auth/model/login_with_email_model.dart';
 import 'package:syncrow_web/pages/auth/model/region_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/services/auth_api.dart';
 import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
@ -442,13 +442,9 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
    emit(LoginInitial());
  }

-  static Future<void> logout(
-      BuildContext context, ProjectCubit projectCubit) async {
+  static Future<void> logout(BuildContext context) async {
    final storage = FlutterSecureStorage();
-
-    await storage.delete(key: ProjectCubit.projectKey);
-
-    projectCubit.clearProjectUUID();
+    ProjectManager.clearProjectUUID();
    storage.deleteAll();
  }
 }
--- a/lib/pages/common/bloc/project_cubit.dart
+++ b/lib/pages/common/bloc/project_cubit.dart
@ -1,19 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-class ProjectCubit extends Cubit<String?> {
-  final FlutterSecureStorage storage;
-  static const String projectKey = "selected_project_uuid";
-
-  ProjectCubit(this.storage) : super(null);
-
-  Future<void> setProjectUUID(String newUUID) async {
-    await storage.write(key: projectKey, value: newUUID);
-    emit(newUUID);
-  }
-
-  Future<void> clearProjectUUID() async {
-    await storage.delete(key: projectKey);
-    emit(null);
-  }
-}
--- a/lib/pages/common/bloc/project_manager.dart
+++ b/lib/pages/common/bloc/project_manager.dart
@ -0,0 +1,19 @@
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
+
+class ProjectManager {
+  static Future<String?> getProjectUUID() async {
+    final projectUuid = await SharedPreferencesHelper.readStringFromSP(
+        StringsManager.projectKey);
+    return projectUuid.isNotEmpty ? projectUuid : null;
+  }
+
+  static Future<void> setProjectUUID(String newUUID) async {
+    await SharedPreferencesHelper.saveStringToSP(
+        StringsManager.projectKey, newUUID);
+  }
+
+  static Future<void> clearProjectUUID() async {
+    await SharedPreferencesHelper.removeValueFromSP(StringsManager.projectKey);
+  }
+}
--- a/lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart
+++ b/lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart
@ -1,11 +1,13 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';

 part 'device_managment_event.dart';
 part 'device_managment_state.dart';
@ -22,9 +24,8 @@ class DeviceManagementBloc
  String currentProductName = '';
  String? currentCommunity;
  String? currentUnitName;
-  final ProjectCubit projectCubit;

-  DeviceManagementBloc(this.projectCubit) : super(DeviceManagementInitial()) {
+  DeviceManagementBloc() : super(DeviceManagementInitial()) {
    on<FetchDevices>(_onFetchDevices);
    on<FilterDevices>(_onFilterDevices);
    on<SelectedFilterChanged>(_onSelectedFilterChanged);
@ -42,18 +43,18 @@ class DeviceManagementBloc
      List<AllDevicesModel> devices = [];
      _devices.clear();
      var spaceBloc = event.context.read<SpaceTreeBloc>();
-      final projectUuid = projectCubit.state;
+           final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      if (spaceBloc.state.selectedCommunities.isEmpty) {
        devices = await DevicesManagementApi()
-            .fetchDevices('', '', projectUuid ?? TempConst.projectId);
+            .fetchDevices('', '', projectUuid );
      } else {
        for (var community in spaceBloc.state.selectedCommunities) {
          List<String> spacesList =
              spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
          for (var space in spacesList) {
            devices.addAll(await DevicesManagementApi().fetchDevices(
-                community, space, projectUuid ?? TempConst.projectId));
+                community, space, projectUuid));
          }
        }
      }
--- a/lib/pages/device_managment/all_devices/view/device_managment_page.dart
+++ b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_managment_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
@ -20,7 +20,8 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
    return MultiBlocProvider(
      providers: [
        BlocProvider(
-          create: (context) => DeviceManagementBloc(context.read<ProjectCubit>())..add(FetchDevices(context)),
+          create: (context) =>
+              DeviceManagementBloc()..add(FetchDevices(context)),
        ),
      ],
      child: WebScaffold(
@ -42,6 +43,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                  context
                      .read<RoutineBloc>()
                      .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
+                  context.read<DeviceManagementBloc>().add(FetchDevices(context));
                },
                child: Text(
                  'Devices',
--- a/lib/pages/home/bloc/home_bloc.dart
+++ b/lib/pages/home/bloc/home_bloc.dart
@ -2,9 +2,10 @@ 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';
+import 'package:shared_preferences/shared_preferences.dart';
 // import 'package:graphview/GraphView.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/home_model/home_item_model.dart';
@ -13,6 +14,8 @@ import 'package:syncrow_web/services/home_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';

 class HomeBloc extends Bloc<HomeEvent, HomeState> {
  // final Graph graph = Graph()..isTree = true;
@ -22,9 +25,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
  UserModel? user;
  String terms = '';
  String policy = '';
-  final ProjectCubit projectCubit;

-  HomeBloc(this.projectCubit) : super((HomeInitial())) {
+  HomeBloc() : super((HomeInitial())) {
    // on<CreateNewNode>(_createNode);
    on<FetchUserInfo>(_fetchUserInfo);
    on<FetchTermEvent>(_fetchTerms);
@ -55,7 +57,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
      user = await HomeApi().fetchUserInfo(uuid);

      if (user != null && user!.project != null) {
-        projectCubit.setProjectUUID(user!.project!.uuid);
+        await ProjectManager.setProjectUUID(user!.project!.uuid);
      }
      add(FetchTermEvent());
      add(FetchPolicyEvent());
--- a/lib/pages/home/view/agreement_and_privacy_dialog.dart
+++ b/lib/pages/home/view/agreement_and_privacy_dialog.dart
@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
 import 'package:url_launcher/url_launcher.dart';
@ -164,8 +164,7 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
              children: [
                InkWell(
                  onTap: () {
-                    final projectCubit = BlocProvider.of<ProjectCubit>(context);
-                    AuthBloc.logout(context, projectCubit);
+                    AuthBloc.logout(context);
                    context.go(RoutesConst.auth);
                  },
                  child: const Text("Cancel"),
--- a/lib/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart
+++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart
@ -1,6 +1,6 @@
 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/custom_dialog.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/edit_user_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/role_type_model.dart';
@ -13,12 +13,12 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/user_permission.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';

 class UsersBloc extends Bloc<UsersEvent, UsersState> {
-  final ProjectCubit projectCubit;
-
-  UsersBloc(this.projectCubit) : super(UsersInitial()) {
+  UsersBloc() : super(UsersInitial()) {
    on<CheckStepStatus>(isCompleteBasicsFun);
    on<LoadCommunityAndSpacesEvent>(_onLoadCommunityAndSpaces);
    on<SearchAnode>(searchTreeNode);
@ -78,10 +78,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {

  Future<List<SpaceModel>> _fetchSpacesForCommunity(
      String communityUuid) async {
-    final projectUuid = projectCubit.state;
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';

    return await CommunitySpaceManagementApi()
-        .getSpaceHierarchy(communityUuid, projectUuid ?? TempConst.projectId);
+        .getSpaceHierarchy(communityUuid, projectUuid);
  }

  List<TreeNode> updatedCommunities = [];
@ -91,9 +91,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
      LoadCommunityAndSpacesEvent event, Emitter<UsersState> emit) async {
    try {
      emit(UsersLoadingState());
-      final projectUuid = projectCubit.state;
-      List<CommunityModel> communities = await CommunitySpaceManagementApi()
-          .fetchCommunities(projectUuid ?? TempConst.projectId);
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      List<CommunityModel> communities =
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
      communityIds = communities.map((community) => community.uuid).toList();
      updatedCommunities = await Future.wait(
        communities.map((community) async {
@ -336,7 +337,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {

  void _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      emit(UsersLoadingState());
      List<String> selectedIds = getSelectedIds(updatedCommunities)
@ -351,7 +352,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
          phoneNumber: phoneController.text,
          roleUuid: roleSelected,
          spaceUuids: selectedIds,
-          projectUuid: projectUuid ?? TempConst.projectId);
+          projectUuid: projectUuid);

      if (res) {
        showCustomDialog(
@ -386,7 +387,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
      List<String> selectedIds = getSelectedIds(updatedCommunities)
          .where((id) => !communityIds.contains(id))
          .toList();
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      bool res = await UserPermissionApi().editInviteUser(
          userId: event.userId,
@ -396,7 +397,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
          phoneNumber: phoneController.text,
          roleUuid: roleSelected,
          spaceUuids: selectedIds,
-          projectUuid: projectUuid ?? TempConst.projectId);
+          projectUuid: projectUuid);
      if (res == true) {
        showCustomDialog(
          barrierDismissible: false,
@ -501,11 +502,11 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
    emit(UsersLoadingState());

    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      if (event.uuid?.isNotEmpty ?? false) {
-        final res = await UserPermissionApi()
-            .fetchUserById(event.uuid, projectUuid ?? TempConst.projectId);
+        final res =
+            await UserPermissionApi().fetchUserById(event.uuid, projectUuid);

        if (res != null) {
          // Populate the text controllers
--- a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart
+++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@ -24,7 +24,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-        create: (BuildContext context) => UsersBloc(context.read<ProjectCubit>())
+        create: (BuildContext context) => UsersBloc()
          ..add(const LoadCommunityAndSpacesEvent())
          ..add(const RoleEvent()),
        child: BlocConsumer<UsersBloc, UsersState>(
--- a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/build_tree_view.dart
+++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/build_tree_view.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@ -22,7 +22,7 @@ class TreeView extends StatelessWidget {
    final _blocRole = BlocProvider.of<UsersBloc>(context);
    debugPrint('TreeView constructed with userId = $userId');
    return BlocProvider(
-      create: (_) => UsersBloc(context.read<ProjectCubit>()),
+      create: (_) => UsersBloc(),
      // ..add(const LoadCommunityAndSpacesEvent()),
      child: BlocConsumer<UsersBloc, UsersState>(
        listener: (context, state) {
--- a/lib/pages/roles_and_permission/users_page/add_user_dialog/view/edit_user_dialog.dart
+++ b/lib/pages/roles_and_permission/users_page/add_user_dialog/view/edit_user_dialog.dart
@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@ -25,7 +25,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
  @override
  Widget build(BuildContext context) {
    return BlocProvider(
-        create: (BuildContext context) => UsersBloc(context.read<ProjectCubit>())
+        create: (BuildContext context) => UsersBloc()
          ..add(const LoadCommunityAndSpacesEvent())
          ..add(const RoleEvent())
          ..add(GetUserByIdEvent(uuid: widget.userId)),
--- a/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart
+++ b/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart
@ -1,17 +1,16 @@
 import 'dart:async';
-import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/roles_user_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bloc/user_table_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bloc/user_table_state.dart';
 import 'package:syncrow_web/services/user_permission.dart';
-import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';

 class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
-  final ProjectCubit _projectCubit;
-
-  UserTableBloc(this._projectCubit) : super(TableInitial()) {
+  UserTableBloc() : super(TableInitial()) {
    on<GetUsers>(_getUsers);
    on<ChangeUserStatus>(_changeUserStatus);
    on<SortUsersByNameAsc>(_toggleSortUsersByNameAsc);
@ -50,13 +49,12 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
  Future<void> _getUsers(GetUsers event, Emitter<UserTableState> emit) async {
    emit(UsersLoadingState());
    try {
-      final projectUuid = _projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      roleTypes.clear();
      jobTitle.clear();
      createdBy.clear();
-      users = await UserPermissionApi()
-          .fetchUsers(projectUuid ?? TempConst.projectId);
+      users = await UserPermissionApi().fetchUsers(projectUuid);
      users.sort((a, b) {
        final dateA = _parseDateTime(a.createdDate);
        final dateB = _parseDateTime(b.createdDate);
@ -103,13 +101,11 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
  Future<void> _changeUserStatus(
      ChangeUserStatus event, Emitter<UserTableState> emit) async {
    try {
-      final projectUuid = _projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      emit(UsersLoadingState());
-      bool res = await UserPermissionApi().changeUserStatusById(
-          event.userId,
-          event.newStatus == "disabled" ? false : true,
-          projectUuid ?? TempConst.projectId);
+      bool res = await UserPermissionApi().changeUserStatusById(event.userId,
+          event.newStatus == "disabled" ? false : true, projectUuid);
      if (res == true) {
        add(const GetUsers());
      }
--- a/lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart
+++ b/lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart
@ -17,7 +17,6 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
-
 class UsersPage extends StatelessWidget {
  UsersPage({super.key});

--- a/lib/pages/roles_and_permission/view/roles_and_permission_page.dart
+++ b/lib/pages/roles_and_permission/view/roles_and_permission_page.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
 import 'package:syncrow_web/pages/roles_and_permission/bloc/roles_permission_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/bloc/roles_permission_state.dart';
@ -77,7 +77,7 @@ class RolesAndPermissionPage extends StatelessWidget {
                    ],
                  ),
                  scaffoldBody: BlocProvider<UserTableBloc>(
-                    create: (context) => UserTableBloc(context.read<ProjectCubit>())..add(const GetUsers()),
+                    create: (context) => UserTableBloc()..add(const GetUsers()),
                    child: UsersPage(),
                  )
                  // _blocRole.tapSelect == false
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@ -3,7 +3,8 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
@ -11,23 +12,25 @@ import 'package:syncrow_web/pages/routines/models/delay/delay_fucntions.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routines/models/routine_model.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/services/routines_api.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 import 'package:uuid/uuid.dart';

 part 'routine_event.dart';
 part 'routine_state.dart';

-String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+// String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+// String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';

 class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
-  final ProjectCubit projectCubit;
-
-  RoutineBloc(this.projectCubit) : super(const RoutineState()) {
+  RoutineBloc() : super(const RoutineState()) {
    on<AddToIfContainer>(_onAddToIfContainer);
    on<AddToThenContainer>(_onAddToThenContainer);
    on<LoadScenes>(_onLoadScenes);
@ -58,12 +61,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    TriggerSwitchTabsEvent event,
    Emitter<RoutineState> emit,
  ) {
-    emit(state.copyWith(
-        routineTab: event.isRoutineTab, createRoutineView: false));
+    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
    add(ResetRoutineState());
    if (event.isRoutineTab) {
-      add(LoadScenes(spaceId, communityId));
-      add(LoadAutomation(spaceId));
+      add(const LoadScenes());
+      add(const LoadAutomation());
    }
  }

@ -85,8 +87,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);

    // Find the index of the item in teh current itemsList
-    int index = updatedIfItems.indexWhere(
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index =
+        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
    // Replace the map if the index is valid
    if (index != -1) {
      updatedIfItems[index] = event.item;
@ -95,21 +97,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    }

    if (event.isTabToRun) {
-      emit(state.copyWith(
-          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
    } else {
-      emit(state.copyWith(
-          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
    }
  }

-  void _onAddToThenContainer(
-      AddToThenContainer event, Emitter<RoutineState> emit) {
+  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
    final currentItems = List<Map<String, dynamic>>.from(state.thenItems);

    // Find the index of the item in teh current itemsList
-    int index = currentItems.indexWhere(
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index =
+        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
    // Replace the map if the index is valid
    if (index != -1) {
      currentItems[index] = event.item;
@ -120,26 +119,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    emit(state.copyWith(thenItems: currentItems));
  }

-  void _onAddFunctionsToRoutine(
-      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
+  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
    try {
      if (event.functions.isEmpty) return;

-      List<DeviceFunctionData> selectedFunction =
-          List<DeviceFunctionData>.from(event.functions);
+      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);

      Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
      if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
        List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(
-                currentSelectedFunctions[event.uniqueCustomId] ?? []);
+            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);

        List<String> functionCode = [];
        for (int i = 0; i < selectedFunction.length; i++) {
          for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode ==
-                currentFunctions[j].functionCode) {
+            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
              currentFunctions[j] = selectedFunction[i];
              if (!functionCode.contains(currentFunctions[j].functionCode)) {
                functionCode.add(currentFunctions[j].functionCode);
@ -149,15 +144,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        }

        for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction
-              .removeWhere((code) => code.functionCode == functionCode[i]);
+          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
        }

-        currentSelectedFunctions[event.uniqueCustomId] =
-            List.from(currentFunctions)..addAll(selectedFunction);
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
+          ..addAll(selectedFunction);
      } else {
-        currentSelectedFunctions[event.uniqueCustomId] =
-            List.from(event.functions);
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
      }

      emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@ -166,21 +159,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    }
  }

-  Future<void> _onLoadScenes(
-      LoadScenes event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
    emit(state.copyWith(isLoading: true, errorMessage: null));
-
+    List<ScenesModel> scenes = [];
    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

-      spaceId = event.spaceId;
-      communityId = event.communityId;
-
-      List<ScenesModel> scenes = [];
-
-      if (communityId.isNotEmpty && spaceId.isNotEmpty) {
-        scenes = await SceneApi.getScenes(event.spaceId, event.communityId, projectUuid ?? TempConst.projectId);
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          scenes.addAll(await SceneApi.getScenes(spaceId, communityId, projectUuid));
+        }
      }
+
      emit(state.copyWith(
        scenes: scenes,
        isLoading: false,
@ -191,19 +184,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
          loadScenesErrorMessage: 'Failed to load scenes',
          errorMessage: '',
          loadAutomationErrorMessage: '',
-          scenes: []));
+          scenes: scenes));
    }
  }

-  Future<void> _onLoadAutomation(
-      LoadAutomation event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
    emit(state.copyWith(isLoading: true, errorMessage: null));
+    List<ScenesModel> automations = [];

    try {
-      spaceId = event.spaceId;
-      List<ScenesModel> automations = [];
-      if (spaceId.isNotEmpty) {
-        automations = await SceneApi.getAutomation(event.spaceId);
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          automations.addAll(await SceneApi.getAutomation(spaceId));
+        }
      }
      emit(state.copyWith(
        automations: automations,
@ -215,20 +211,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
          loadAutomationErrorMessage: 'Failed to load automations',
          errorMessage: '',
          loadScenesErrorMessage: '',
-          automations: []));
+          automations: automations));
    }
  }

-  FutureOr<void> _onSearchRoutines(
-      SearchRoutines event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
    emit(state.copyWith(isLoading: true, errorMessage: null));
    await Future.delayed(const Duration(seconds: 1));
    emit(state.copyWith(isLoading: false, errorMessage: null));
    emit(state.copyWith(searchText: event.query));
  }

-  FutureOr<void> _onAddSelectedIcon(
-      AddSelectedIcon event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
    emit(state.copyWith(selectedIcon: event.icon));
  }

@ -242,8 +236,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    return actions.last['deviceId'] == 'delay';
  }

-  Future<void> _onCreateScene(
-      CreateSceneEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
    try {
      // Check if first action is delay
      // if (_isFirstActionDelay(state.thenItems)) {
@ -256,8 +249,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {

      if (_isLastActionDelay(state.thenItems)) {
        emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
          isLoading: false,
        ));
        return;
@ -302,8 +294,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        });
      }).toList();

+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+
      final createSceneModel = CreateSceneModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
        iconId: state.selectedIcon ?? '',
        showInDevice: true,
        sceneName: state.routineName ?? '',
@ -314,8 +309,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
      final result = await SceneApi.createScene(createSceneModel);
      if (result['success']) {
        add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
-        add(LoadAutomation(spaceId));
+        add(const LoadScenes());
+        add(const LoadAutomation());
      } else {
        emit(state.copyWith(
          isLoading: false,
@ -330,8 +325,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    }
  }

-  Future<void> _onCreateAutomation(
-      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
    try {
      if (state.routineName == null || state.routineName!.isEmpty) {
        emit(state.copyWith(
@ -352,8 +346,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {

      if (_isLastActionDelay(state.thenItems)) {
        emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
          isLoading: false,
        ));
        CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@ -428,9 +421,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
          );
        });
      }).toList();
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();

      final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
        automationName: state.routineName ?? '',
        decisionExpr: state.selectedAutomationOperator,
        effectiveTime: EffectiveTime(
@ -445,8 +440,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
      final result = await SceneApi.createAutomation(createAutomationModel);
      if (result['success']) {
        add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadAutomation());
+        add(const LoadScenes());
      } else {
        emit(state.copyWith(
          isLoading: false,
@ -463,21 +458,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    }
  }

-  FutureOr<void> _onRemoveDragCard(
-      RemoveDragCard event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
    if (event.isFromThen) {
      final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions =
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);

      thenItems.removeAt(event.index);
      selectedFunctions.remove(event.key);
-      emit(state.copyWith(
-          thenItems: thenItems, selectedFunctions: selectedFunctions));
+      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
    } else {
      final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions =
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);

      ifItems.removeAt(event.index);
      selectedFunctions.remove(event.key);
@ -488,8 +479,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
            isAutomation: false,
            isTabToRun: false));
      } else {
-        emit(state.copyWith(
-            ifItems: ifItems, selectedFunctions: selectedFunctions));
+        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
      }
    }
  }
@ -501,23 +491,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    ));
  }

-  FutureOr<void> _onEffectiveTimeEvent(
-      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
    emit(state.copyWith(effectiveTime: event.effectiveTime));
  }

-  FutureOr<void> _onSetRoutineName(
-      SetRoutineName event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
    emit(state.copyWith(
      routineName: event.name,
    ));
  }

-  (
-    List<Map<String, dynamic>>,
-    List<Map<String, dynamic>>,
-    Map<String, List<DeviceFunctionData>>
-  ) _createCardData(
+  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
+      _createCardData(
    List<RoutineAction> actions,
    List<RoutineCondition>? conditions,
    Map<String, List<DeviceFunctionData>> currentFunctions,
@ -550,8 +535,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                'deviceId': condition.entityId,
                'title': matchingDevice.name ?? condition.entityId,
                'productType': condition.entityType,
-                'imagePath':
-                    matchingDevice.getDefaultIcon(condition.entityType),
+                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
              };

              final functions = matchingDevice.functions;
@ -587,11 +571,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
      final cardData = {
        'entityId': action.entityId,
        'uniqueCustomId': const Uuid().v4(),
-        'deviceId':
-            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-        'title': action.actionExecutor == 'delay'
-            ? 'Delay'
-            : (matchingDevice.name ?? 'Device'),
+        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
        'productType': action.productType,
        'imagePath': matchingDevice.getDefaultIcon(action.productType),
      };
@ -634,8 +615,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    return (thenItems, ifItems, currentFunctions);
  }

-  Future<void> _onGetSceneDetails(
-      GetSceneDetails event, Emitter<RoutineState> emit) async {
+  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
    try {
      emit(state.copyWith(
        isLoading: true,
@ -683,12 +663,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        if (!deviceCards.containsKey(deviceId)) {
          deviceCards[deviceId] = {
            'entityId': action.entityId,
-            'deviceId':
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId':
-                action.type == 'automation' || action.actionExecutor == 'delay'
-                    ? const Uuid().v4()
-                    : action.entityId,
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
+                ? const Uuid().v4()
+                : action.entityId,
            'title': action.actionExecutor == 'delay'
                ? 'Delay'
                : action.type == 'automation'
@ -723,8 +701,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
            ),
          );
          // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null &&
-            action.actionExecutor != 'delay') {
+        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
          if (!updatedFunctions.containsKey(uniqueCustomId)) {
            updatedFunctions[uniqueCustomId] = [];
          }
@ -796,8 +773,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    }
  }

-  FutureOr<void> _onResetRoutineState(
-      ResetRoutineState event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
    emit(state.copyWith(
        ifItems: [],
        thenItems: [],
@ -821,18 +797,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        createRoutineView: false));
  }

-  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) {
+  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
    try {
      emit(state.copyWith(isLoading: true));
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
      if (state.isTabToRun) {
-        SceneApi.deleteScene(unitUuid: spaceId, sceneId: state.sceneId ?? '');
+        await SceneApi.deleteScene(
+            unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
      } else {
-        SceneApi.deleteAutomation(
-            unitUuid: spaceId, automationId: state.automationId ?? '');
+        await SceneApi.deleteAutomation(
+            unitUuid: spaceBloc.state.selectedSpaces[0], automationId: state.automationId ?? '');
      }

-      add(LoadScenes(spaceId, communityId));
-      add(LoadAutomation(spaceId));
+      add(const LoadScenes());
+      add(const LoadAutomation());
      add(ResetRoutineState());
      emit(state.copyWith(isLoading: false, createRoutineView: false));
    } catch (e) {
@ -857,13 +836,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
  //   }
  // }

-  FutureOr<void> _fetchDevices(
-      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
    emit(state.copyWith(isLoading: true));
    try {
-      final projectUuid = projectCubit.state;
-      final devices = await DevicesManagementApi()
-          .fetchDevices('', '', projectUuid ?? TempConst.projectId);
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      List<AllDevicesModel> devices = [];
+
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          devices
+              .addAll(await DevicesManagementApi().fetchDevices(communityId, spaceId, projectUuid));
+        }
+      }

      emit(state.copyWith(isLoading: false, devices: devices));
    } catch (e) {
@ -871,8 +859,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    }
  }

-  FutureOr<void> _onUpdateScene(
-      UpdateScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
    try {
      // Check if first action is delay
      // if (_isFirstActionDelay(state.thenItems)) {
@ -886,8 +873,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {

      if (_isLastActionDelay(state.thenItems)) {
        emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
          isLoading: false,
        ));
        return;
@ -940,12 +926,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        actions: actions,
      );

-      final result =
-          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
+      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
      if (result['success']) {
        add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
-        add(LoadAutomation(spaceId));
+        add(const LoadScenes());
+        add(const LoadAutomation());
      } else {
        emit(state.copyWith(
          isLoading: false,
@ -960,8 +945,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
    }
  }

-  FutureOr<void> _onUpdateAutomation(
-      UpdateAutomation event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
    try {
      if (state.routineName == null || state.routineName!.isEmpty) {
        emit(state.copyWith(
@ -1056,8 +1040,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        });
      }).toList();

+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+
      final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.state.selectedSpaces[0],
        automationName: state.routineName ?? '',
        decisionExpr: state.selectedAutomationOperator,
        effectiveTime: EffectiveTime(
@ -1069,13 +1056,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        actions: actions,
      );

-      final result = await SceneApi.updateAutomation(
-          createAutomationModel, state.automationId ?? '');
+      final result =
+          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');

      if (result['success']) {
        add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
-        add(LoadScenes(spaceId, communityId));
+        add(LoadAutomation());
+        add(LoadScenes());
      } else {
        emit(state.copyWith(
          isLoading: false,
@ -1103,8 +1090,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        thenItems: [],
      ));

-      final automationDetails =
-          await SceneApi.getAutomationDetails(event.automationId);
+      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);

      final Map<String, Map<String, dynamic>> deviceIfCards = {};
      final Map<String, Map<String, dynamic>> deviceThenCards = {};
@ -1172,15 +1158,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
          ),
        );

-        final deviceId = action.actionExecutor == 'delay'
-            ? '${action.entityId}_delay'
-            : action.entityId;
+        final deviceId =
+            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;

        if (!deviceThenCards.containsKey(deviceId)) {
          deviceThenCards[deviceId] = {
            'entityId': action.entityId,
-            'deviceId':
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
            'uniqueCustomId': const Uuid().v4(),
            'title': action.actionExecutor == 'delay'
                ? 'Delay'
@ -1211,8 +1195,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
          updatedFunctions[uniqueCustomId] = [];
        }

-        if (action.executorProperty != null &&
-            action.actionExecutor != 'delay') {
+        if (action.executorProperty != null && action.actionExecutor != 'delay') {
          final functions = matchingDevice.functions;
          final functionCode = action.executorProperty!.functionCode;
          for (var function in functions) {
@ -1254,14 +1237,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
        }
      }

-      final ifItems = deviceIfCards.values
-          .where((card) => card['type'] == 'condition')
-          .toList();
+      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
      final thenItems = deviceThenCards.values
          .where((card) =>
-              card['type'] == 'action' ||
-              card['type'] == 'automation' ||
-              card['type'] == 'scene')
+              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
          .toList();

      emit(state.copyWith(
--- a/lib/pages/routines/bloc/routine_bloc/routine_event.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_event.dart
@ -27,22 +27,24 @@ class AddToThenContainer extends RoutineEvent {
 }

 class LoadScenes extends RoutineEvent {
-  final String spaceId;
-  final String communityId;
+  // final String spaceId;
+  // final String communityId;
+  // final BuildContext context;

-  const LoadScenes(this.spaceId, this.communityId);
+  const LoadScenes();

  @override
-  List<Object> get props => [spaceId, communityId];
+  List<Object> get props => [];
 }

 class LoadAutomation extends RoutineEvent {
-  final String spaceId;
+  // final String spaceId;
+  // final BuildContext context;

-  const LoadAutomation(this.spaceId);
+  const LoadAutomation();

  @override
-  List<Object> get props => [spaceId];
+  List<Object> get props => [];
 }

 class AddFunctionToRoutine extends RoutineEvent {
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@ -20,7 +20,7 @@ class _RoutinesViewState extends State<RoutinesView> {
  @override
  void initState() {
    super.initState();
-    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+    // context.read<RoutineBloc>().add(FetchDevicesInRoutine());
  }

  @override
@ -32,9 +32,12 @@ class _RoutinesViewState extends State<RoutinesView> {
        }
        return Row(
          children: [
-            Expanded(
-                child: SpaceTreeView(
-              onSelect: () {},
+            Expanded(child: SpaceTreeView(
+              onSelect: () {
+                context.read<RoutineBloc>()
+                  ..add(const LoadScenes())
+                  ..add(const LoadAutomation());
+              },
            )),
            Expanded(
              flex: 4,
@ -59,8 +62,8 @@ class _RoutinesViewState extends State<RoutinesView> {
                      ),
                      RoutineViewCard(
                        onTap: () {
-                          if (context.read<SpaceTreeBloc>().selectedCommunityId.isNotEmpty &&
-                              context.read<SpaceTreeBloc>().selectedSpaceId.isNotEmpty) {
+                          if (context.read<SpaceTreeBloc>().state.selectedCommunities.length == 1 &&
+                              context.read<SpaceTreeBloc>().state.selectedSpaces.length == 1) {
                            context.read<RoutineBloc>().add(
                                  (ResetRoutineState()),
                                );
@ -68,7 +71,18 @@ class _RoutinesViewState extends State<RoutinesView> {
                              const CreateNewRoutineViewEvent(createRoutineView: true),
                            );
                          } else {
-                            CustomSnackBar.redSnackBar('Please select a space');
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              SnackBar(
+                                content: Text(
+                                    context.read<SpaceTreeBloc>().state.selectedSpaces.isEmpty
+                                        ? 'Please select a space'
+                                        : 'Please select only one space to proceed'),
+                              ),
+                            );
+                            // CustomSnackBar.redSnackBar(
+                            //     context.read<SpaceTreeBloc>().state.selectedSpaces.isEmpty
+                            //         ? 'Please select a space'
+                            //         : 'Please select only one space to proceed');
                          }
                        },
                        icon: Icons.add,
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@ -20,10 +20,6 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
  @override
  void initState() {
    super.initState();
-    context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
-          context.read<SpaceTreeBloc>().selectedCommunityId))
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
  }

  @override
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@ -4,9 +4,20 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';

-class RoutineDevices extends StatelessWidget {
+class RoutineDevices extends StatefulWidget {
  const RoutineDevices({super.key});

+  @override
+  State<RoutineDevices> createState() => _RoutineDevicesState();
+}
+
+class _RoutineDevicesState extends State<RoutineDevices> {
+  @override
+  void initState() {
+    super.initState();
+    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+  }
+
  @override
  Widget build(BuildContext context) {
    return BlocBuilder<RoutineBloc, RoutineState>(
--- a/lib/pages/routines/widgets/scenes_and_automations.dart
+++ b/lib/pages/routines/widgets/scenes_and_automations.dart
@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';

 class ScenesAndAutomations extends StatefulWidget {
@ -19,9 +18,8 @@ class _ScenesAndAutomationsState extends State<ScenesAndAutomations> {
  void initState() {
    super.initState();
    context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
-          context.read<SpaceTreeBloc>().selectedCommunityId))
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
+      ..add(const LoadScenes())
+      ..add(const LoadAutomation());
  }

  @override
--- a/lib/pages/space_tree/bloc/space_tree_bloc.dart
+++ b/lib/pages/space_tree/bloc/space_tree_bloc.dart
@ -1,18 +1,24 @@
+import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';

 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
-  String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
-  String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-  final ProjectCubit projectCubit;
+  // String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+  // String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+  final TextEditingController textController = TextEditingController();

-  SpaceTreeBloc(this.projectCubit) : super(const SpaceTreeState()) {
+  // String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+  // String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+
+  SpaceTreeBloc() : super(const SpaceTreeState()) {
    on<InitialEvent>(_fetchSpaces);
    on<OnCommunityExpanded>(_onCommunityExpanded);
    on<OnSpaceExpanded>(_onSpaceExpanded);
@ -24,16 +30,15 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
  _fetchSpaces(InitialEvent event, Emitter<SpaceTreeState> emit) async {
    emit(SpaceTreeLoadingState());
    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

-      List<CommunityModel> communities = await CommunitySpaceManagementApi()
-          .fetchCommunities(projectUuid ?? TempConst.projectId);
+      List<CommunityModel> communities =
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);

      List<CommunityModel> updatedCommunities = await Future.wait(
        communities.map((community) async {
-          List<SpaceModel> spaces = await CommunitySpaceManagementApi()
-              .getSpaceHierarchy(
-                  community.uuid, projectUuid ?? TempConst.projectId);
+          List<SpaceModel> spaces =
+              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid, projectUuid);

          return CommunityModel(
            uuid: community.uuid,
@ -48,19 +53,15 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
      );

      emit(state.copyWith(
-          communitiesList: updatedCommunities,
-          expandedCommunity: [],
-          expandedSpaces: []));
+          communitiesList: updatedCommunities, expandedCommunity: [], expandedSpaces: []));
    } catch (e) {
      emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
    }
  }

-  _onCommunityExpanded(
-      OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
+  _onCommunityExpanded(OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
    try {
-      List<String> updatedExpandedCommunityList =
-          List.from(state.expandedCommunities);
+      List<String> updatedExpandedCommunityList = List.from(state.expandedCommunities);

      if (updatedExpandedCommunityList.contains(event.communityId)) {
        updatedExpandedCommunityList.remove(event.communityId);
@ -92,17 +93,13 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
    }
  }

-  _onCommunitySelected(
-      OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
+  _onCommunitySelected(OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
    try {
      List<String> updatedSelectedCommunities =
          List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
-          List.from(state.selectedSpaces.toSet().toList());
-      List<String> updatedSoldChecks =
-          List.from(state.soldCheck.toSet().toList());
-      Map<String, List<String>> communityAndSpaces =
-          Map.from(state.selectedCommunityAndSpaces);
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);

      List<String> childrenIds = _getAllChildIds(event.children);

@ -133,12 +130,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
    try {
      List<String> updatedSelectedCommunities =
          List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
-          List.from(state.selectedSpaces.toSet().toList());
-      List<String> updatedSoldChecks =
-          List.from(state.soldCheck.toSet().toList());
-      Map<String, List<String>> communityAndSpaces =
-          Map.from(state.selectedCommunityAndSpaces);
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);

      List<String> childrenIds = _getAllChildIds(event.children);
      bool isChildSelected = false;
@ -158,11 +152,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
          updatedSelectedSpaces.addAll(childrenIds);
        }

-        List<String> spaces =
-            _getThePathToChild(event.communityId, event.spaceId);
+        List<String> spaces = _getThePathToChild(event.communityId, event.spaceId);
        for (String space in spaces) {
-          if (!updatedSelectedSpaces.contains(space) &&
-              !updatedSoldChecks.contains(space)) {
+          if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
            updatedSoldChecks.add(space);
          }
        }
@ -181,8 +173,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
        }
        updatedSoldChecks.remove(event.spaceId);

-        List<String> parents =
-            _getThePathToChild(event.communityId, event.spaceId);
+        List<String> parents = _getThePathToChild(event.communityId, event.spaceId);
        if (!_parentSelected(parents, updatedSelectedSpaces)) {
          updatedSoldChecks.removeWhere(parents.contains);
        }
@ -195,7 +186,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
      communityAndSpaces[event.communityId] = updatedSelectedSpaces;

      emit(state.copyWith(
-          selectedCommunities: updatedSelectedCommunities,
+          selectedCommunities: updatedSelectedCommunities.toSet().toList(),
          selectedSpaces: updatedSelectedSpaces,
          soldCheck: updatedSoldChecks,
          selectedCommunityAndSpaces: communityAndSpaces));
@ -221,18 +212,18 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {

      // Filter communities and expand only those that match the query
      filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity = community.name
-            .toLowerCase()
-            .contains(event.searchQuery.toLowerCase());
-        final containsQueryInSpaces = community.spaces.any(
-            (space) => _containsQuery(space, event.searchQuery.toLowerCase()));
+        final containsQueryInCommunity =
+            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
+        final containsQueryInSpaces =
+            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));

        return containsQueryInCommunity || containsQueryInSpaces;
      }).toList();

      emit(state.copyWith(
          filteredCommunity: filteredCommunity,
-          isSearching: event.searchQuery.isNotEmpty));
+          isSearching: event.searchQuery.isNotEmpty,
+          searchQuery: event.searchQuery));
    } catch (e) {
      emit(const SpaceTreeErrorState('Something went wrong'));
    }
@ -241,8 +232,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
  // Helper function to determine if any space or its children match the search query
  bool _containsQuery(SpaceModel space, String query) {
    final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren = space.children.any((child) =>
-        _containsQuery(child, query)); // Recursive check for children
+    final matchesChildren =
+        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children

    return matchesSpace || matchesChildren;
  }
@ -256,15 +247,14 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
    return ids;
  }

-  bool _anySpacesSelectedInCommunity(String communityId,
-      List<String> selectedSpaces, List<String> partialCheckedList) {
+  bool _anySpacesSelectedInCommunity(
+      String communityId, List<String> selectedSpaces, List<String> partialCheckedList) {
    bool result = false;
    for (var community in state.communityList) {
      if (community.uuid == communityId) {
        List<String> ids = _getAllChildIds(community.spaces);
        for (var id in ids) {
-          result =
-              selectedSpaces.contains(id) || partialCheckedList.contains(id);
+          result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
          if (result) {
            return result;
          }
@ -291,8 +281,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
    return ids;
  }

-  List<String> _getAllParentsIds(
-      SpaceModel child, String spaceId, List<String> listIds) {
+  List<String> _getAllParentsIds(SpaceModel child, String spaceId, List<String> listIds) {
    List<String> ids = listIds;

    ids.add(child.uuid ?? '');
@ -313,4 +302,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
    ids.removeLast();
    return [];
  }
+
+  @override
+  Future<void> close() async {
+    textController.dispose();
+    super.close();
+  }
 }
--- a/lib/pages/space_tree/bloc/space_tree_state.dart
+++ b/lib/pages/space_tree/bloc/space_tree_state.dart
@ -11,6 +11,7 @@ class SpaceTreeState extends Equatable {
  final List<String> selectedSpaces;
  final List<String> soldCheck;
  final bool isSearching;
+  final String searchQuery;

  const SpaceTreeState(
      {this.communityList = const [],
@ -21,7 +22,8 @@ class SpaceTreeState extends Equatable {
      this.selectedSpaces = const [],
      this.soldCheck = const [],
      this.isSearching = false,
-      this.selectedCommunityAndSpaces = const {}});
+      this.selectedCommunityAndSpaces = const {},
+      this.searchQuery = ''});

  SpaceTreeState copyWith(
      {List<CommunityModel>? communitiesList,
@ -32,7 +34,8 @@ class SpaceTreeState extends Equatable {
      List<String>? selectedSpaces,
      List<String>? soldCheck,
      bool? isSearching,
-      Map<String, List<String>>? selectedCommunityAndSpaces}) {
+      Map<String, List<String>>? selectedCommunityAndSpaces,
+      String? searchQuery}) {
    return SpaceTreeState(
        communityList: communitiesList ?? this.communityList,
        filteredCommunity: filteredCommunity ?? this.filteredCommunity,
@ -42,7 +45,8 @@ class SpaceTreeState extends Equatable {
        selectedSpaces: selectedSpaces ?? this.selectedSpaces,
        soldCheck: soldCheck ?? this.soldCheck,
        isSearching: isSearching ?? this.isSearching,
-        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces);
+        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces,
+        searchQuery: searchQuery ?? this.searchQuery);
  }

  @override
@ -55,7 +59,8 @@ class SpaceTreeState extends Equatable {
        selectedSpaces,
        soldCheck,
        isSearching,
-        selectedCommunityAndSpaces
+        selectedCommunityAndSpaces,
+        searchQuery
      ];
 }

--- a/lib/pages/space_tree/view/space_tree_view.dart
+++ b/lib/pages/space_tree/view/space_tree_view.dart
@ -39,6 +39,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
            : Column(
                children: [
                  CustomSearchBar(
+                    searchQuery: state.searchQuery,
                    onSearchChanged: (query) {
                      context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
                    },
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@ -1,5 +1,8 @@
+import 'dart:developer';
+
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@ -15,19 +18,19 @@ 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/constants/action_enum.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';

 class SpaceManagementBloc
    extends Bloc<SpaceManagementEvent, SpaceManagementState> {
  final CommunitySpaceManagementApi _api;
  final ProductApi _productApi;
  final SpaceModelManagementApi _spaceModelApi;
-  final ProjectCubit projectCubit;

  List<ProductModel>? _cachedProducts;

-  SpaceManagementBloc(
-      this._api, this._productApi, this._spaceModelApi, this.projectCubit)
+  SpaceManagementBloc(this._api, this._productApi, this._spaceModelApi)
      : super(SpaceManagementInitial()) {
    on<LoadCommunityAndSpacesEvent>(_onLoadCommunityAndSpaces);
    on<UpdateSpacePositionEvent>(_onUpdateSpacePosition);
@ -43,17 +46,23 @@ class SpaceManagementBloc
    on<SpaceModelLoadEvent>(_onLoadSpaceModel);
  }

+  void _logEvent(String eventName) {
+    log('Event Triggered: $eventName');
+  }
+
  void _onUpdateCommunity(
    UpdateCommunityEvent event,
    Emitter<SpaceManagementState> emit,
  ) async {
+    _logEvent('UpdateCommunityEvent');
+
    final previousState = state;
    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      emit(SpaceManagementLoading());
      final success = await _api.updateCommunity(
-          event.communityUuid, event.name, projectUuid ?? TempConst.projectId);
+          event.communityUuid, event.name, projectUuid);
      if (success) {
        if (previousState is SpaceManagementLoaded) {
          final updatedCommunities =
@ -85,7 +94,7 @@ class SpaceManagementBloc
  Future<List<SpaceTemplateModel>> fetchSpaceModels(
      SpaceManagementState previousState) async {
    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      List<SpaceTemplateModel> allSpaces = [];
      List<SpaceTemplateModel> prevSpaceModels = [];
@ -104,7 +113,7 @@ class SpaceManagementBloc

        while (hasNext) {
          final spaces = await _spaceModelApi.listSpaceModels(
-              page: page, projectId: projectUuid ?? TempConst.projectId);
+              page: page, projectId: projectUuid);
          if (spaces.isNotEmpty) {
            allSpaces.addAll(spaces);
            page++;
@ -113,7 +122,7 @@ class SpaceManagementBloc
          }
        }
        prevSpaceModels = await _spaceModelApi.listSpaceModels(
-            page: 1, projectId: projectUuid ?? TempConst.projectId);
+            page: 1, projectId: projectUuid);
      }

      return allSpaces;
@ -142,10 +151,9 @@ class SpaceManagementBloc

  Future<List<SpaceModel>> _fetchSpacesForCommunity(
      String communityUuid) async {
-    final projectUuid = projectCubit.state;
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';

-    return await _api.getSpaceHierarchy(
-        communityUuid, projectUuid ?? TempConst.projectId);
+    return await _api.getSpaceHierarchy(communityUuid, projectUuid);
  }

  Future<void> _onNewCommunity(
@ -176,7 +184,7 @@ class SpaceManagementBloc
      BlankStateEvent event, Emitter<SpaceManagementState> emit) async {
    try {
      final previousState = state;
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      var prevSpaceModels = await fetchSpaceModels(previousState);

@ -191,8 +199,7 @@ class SpaceManagementBloc
        return;
      }

-      final communities =
-          await _api.fetchCommunities(projectUuid ?? TempConst.projectId);
+      final communities = await _api.fetchCommunities(projectUuid);
      final updatedCommunities =
          await Future.wait(communities.map((community) async {
        final spaces = await _fetchSpacesForCommunity(community.uuid);
@ -222,14 +229,16 @@ class SpaceManagementBloc
    LoadCommunityAndSpacesEvent event,
    Emitter<SpaceManagementState> emit,
  ) async {
+    _logEvent('LoadCommunityAndSpacesEvent');
+
    var prevState = state;
    emit(SpaceManagementLoading());
    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      _onloadProducts();
      List<CommunityModel> communities =
-          await _api.fetchCommunities(projectUuid ?? TempConst.projectId);
+          await _api.fetchCommunities(projectUuid);

      List<CommunityModel> updatedCommunities = await Future.wait(
        communities.map((community) async {
@ -263,10 +272,10 @@ class SpaceManagementBloc
  ) async {
    try {
      emit(SpaceManagementLoading());
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

-      final success = await _api.deleteCommunity(
-          event.communityUuid, projectUuid ?? TempConst.projectId);
+      final success =
+          await _api.deleteCommunity(event.communityUuid, projectUuid);
      if (success) {
        add(LoadCommunityAndSpacesEvent());
      } else {
@ -291,9 +300,10 @@ class SpaceManagementBloc
    emit(SpaceManagementLoading());

    try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
      CommunityModel? newCommunity = await _api.createCommunity(
-          event.name, event.description, projectUuid ?? TempConst.projectId);
+          event.name, event.description, projectUuid);
      var prevSpaceModels = await fetchSpaceModels(previousState);

      if (newCommunity != null) {
@ -436,7 +446,7 @@ class SpaceManagementBloc
  Future<List<SpaceModel>> saveSpacesHierarchically(
      List<SpaceModel> spaces, String communityUuid) async {
    final orderedSpaces = flattenHierarchy(spaces);
-    final projectUuid = projectCubit.state;
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';

    final parentsToDelete = orderedSpaces.where((space) =>
        space.status == SpaceStatus.deleted &&
@ -445,8 +455,7 @@ class SpaceManagementBloc
    for (var parent in parentsToDelete) {
      try {
        if (parent.uuid != null) {
-          await _api.deleteSpace(
-              communityUuid, parent.uuid!, projectUuid ?? TempConst.projectId);
+          await _api.deleteSpace(communityUuid, parent.uuid!, projectUuid);
        }
      } catch (e) {
        rethrow;
@ -459,8 +468,8 @@ class SpaceManagementBloc
        if (space.uuid != null && space.uuid!.isNotEmpty) {
          List<TagModelUpdate> tagUpdates = [];

-          final prevSpace = await _api.getSpace(
-              communityUuid, space.uuid!, projectUuid ?? TempConst.projectId);
+          final prevSpace =
+              await _api.getSpace(communityUuid, space.uuid!, projectUuid);
          final List<UpdateSubspaceTemplateModel> subspaceUpdates = [];
          final List<SubspaceModel>? prevSubspaces = prevSpace?.subspaces;
          final List<SubspaceModel>? newSubspaces = space.subspaces;
@ -539,7 +548,7 @@ class SpaceManagementBloc
              subspaces: subspaceUpdates,
              tags: tagUpdates,
              direction: space.incomingConnection?.direction,
-              projectId: projectUuid ?? TempConst.projectId);
+              projectId: projectUuid);
        } else {
          // Call create if the space does not have a UUID
          final List<CreateTagBodyModel> tagBodyModels = space.tags != null
@ -568,7 +577,7 @@ class SpaceManagementBloc
              spaceModelUuid: space.spaceModel?.uuid,
              tags: tagBodyModels,
              subspaces: createSubspaceBodyModels,
-              projectId: projectUuid ?? TempConst.projectId);
+              projectId: projectUuid);
          space.uuid = response?.uuid;
        }
      } catch (e) {
@ -608,10 +617,10 @@ class SpaceManagementBloc
    emit(SpaceManagementLoading());
    try {
      var prevState = state;
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';

      List<CommunityModel> communities =
-          await _api.fetchCommunities(projectUuid ?? TempConst.projectId);
+          await _api.fetchCommunities(projectUuid);

      List<CommunityModel> updatedCommunities = await Future.wait(
        communities.map((community) async {
--- a/lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart
+++ b/lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart
@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
@ -33,7 +32,6 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
            _api,
            _productApi,
            _spaceModelApi,
-            context.read<ProjectCubit>(),
          )..add(LoadCommunityAndSpacesEvent()),
        ),
        BlocProvider(
--- a/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
@ -75,20 +75,14 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
    return Stack(
      clipBehavior: Clip.none,
      children: [
-        Row(
-          children: [
-            SidebarWidget(
-              communities: widget.communities,
-              selectedSpaceUuid: widget.selectedSpace?.uuid ??
-                  widget.selectedCommunity?.uuid ??
-                  '',
-            ),
-            widget.shouldNavigateToSpaceModelPage
-                ? Expanded(
+        widget.shouldNavigateToSpaceModelPage
+            ? Row(
+                children: [
+                  SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
+                  Expanded(
                    child: BlocProvider(
                      create: (context) => SpaceModelBloc(
                        api: SpaceModelManagementApi(),
-                        projectCubit: context.read<ProjectCubit>(),
                        initialSpaceModels: _spaceModels,
                      ),
                      child: SpaceModelPage(
@ -96,8 +90,17 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                        onSpaceModelsUpdated: _onSpaceModelsUpdated,
                      ),
                    ),
-                  )
-                : CommunityStructureArea(
+                  ),
+                ],
+              )
+            : Row(
+                children: [
+                  SidebarWidget(
+                    communities: widget.communities,
+                    selectedSpaceUuid:
+                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
+                  ),
+                  CommunityStructureArea(
                    selectedCommunity: widget.selectedCommunity,
                    selectedSpace: widget.selectedSpace,
                    spaces: widget.selectedCommunity?.spaces ?? [],
@ -105,8 +108,8 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                    communities: widget.communities,
                    spaceModels: _spaceModels,
                  ),
-          ],
-        ),
+                ],
+              ),
        const GradientCanvasBorderWidget(),
      ],
    );
--- a/lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart
+++ b/lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart
@ -1,5 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
@ -9,20 +9,21 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
 import 'package:syncrow_web/utils/constants/action_enum.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';

 class CreateSpaceModelBloc
    extends Bloc<CreateSpaceModelEvent, CreateSpaceModelState> {
  SpaceTemplateModel? _space;

  final SpaceModelManagementApi _api;
-  final ProjectCubit _projectCubit;

-  CreateSpaceModelBloc(this._api, this._projectCubit)
-      : super(CreateSpaceModelInitial()) {
+  CreateSpaceModelBloc(this._api) : super(CreateSpaceModelInitial()) {
    on<CreateSpaceTemplate>((event, emit) async {
      try {
-        final projectUuid = _projectCubit.state;
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
        late SpaceTemplateModel spaceTemplate = event.spaceTemplate;

        final tagBodyModels =
@ -45,8 +46,8 @@ class CreateSpaceModelBloc
            tags: tagBodyModels,
            subspaceModels: subspaceTemplateBodyModels);

-        final newSpaceTemplate = await _api.createSpaceModel(
-            spaceModelBody, projectUuid ?? TempConst.projectId);
+        final newSpaceTemplate =
+            await _api.createSpaceModel(spaceModelBody, projectUuid);
        spaceTemplate.uuid = newSpaceTemplate?.uuid ?? '';

        if (newSpaceTemplate != null) {
@ -207,12 +208,11 @@ class CreateSpaceModelBloc

    on<ModifySpaceTemplate>((event, emit) async {
      try {
-        final projectUuid = _projectCubit.state;
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';

        if (event.spaceTemplate.uuid != null) {
          final prevSpaceModel = await _api.getSpaceModel(
-              event.spaceTemplate.uuid ?? '',
-              projectUuid ?? TempConst.projectId);
+              event.spaceTemplate.uuid ?? '', projectUuid);

          final newSpaceModel = event.updatedSpaceTemplate;
          String? spaceModelName;
@ -295,8 +295,8 @@ class CreateSpaceModelBloc
              tags: tagUpdates,
              subspaceModels: subspaceUpdates);

-          final res = await _api.updateSpaceModel(spaceModelBody,
-              prevSpaceModel?.uuid ?? '', projectUuid ?? TempConst.projectId);
+          final res = await _api.updateSpaceModel(
+              spaceModelBody, prevSpaceModel?.uuid ?? '', projectUuid);

          if (res != null) {
            emit(CreateSpaceModelLoaded(newSpaceModel));
--- a/lib/pages/spaces_management/space_model/bloc/space_model_bloc.dart
+++ b/lib/pages/spaces_management/space_model/bloc/space_model_bloc.dart
@ -1,18 +1,18 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';

 class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
  final SpaceModelManagementApi api;
-  final ProjectCubit projectCubit;

  SpaceModelBloc({
    required this.api,
-    required this.projectCubit,
    required List<SpaceTemplateModel> initialSpaceModels,
  }) : super(SpaceModelLoaded(spaceModels: initialSpaceModels)) {
    on<CreateSpaceModel>(_onCreateSpaceModel);
@ -25,9 +25,10 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {

    if (currentState is SpaceModelLoaded) {
      try {
-        final projectUuid = projectCubit.state;
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
        final newSpaceModel = await api.getSpaceModel(
-            event.newSpaceModel.uuid ?? '', projectUuid ?? TempConst.projectId);
+            event.newSpaceModel.uuid ?? '', projectUuid);

        if (newSpaceModel != null) {
          final updatedSpaceModels =
@ -46,10 +47,10 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
    final currentState = state;
    if (currentState is SpaceModelLoaded) {
      try {
-        final projectUuid = projectCubit.state;
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';

-        final newSpaceModel = await api.getSpaceModel(
-            event.spaceModelUuid ?? '', projectUuid ?? TempConst.projectId);
+        final newSpaceModel =
+            await api.getSpaceModel(event.spaceModelUuid ?? '', projectUuid);
        if (newSpaceModel != null) {
          final updatedSpaceModels = currentState.spaceModels.map((model) {
            return model.uuid == event.spaceModelUuid ? newSpaceModel : model;
--- a/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
+++ b/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@ -53,7 +52,6 @@ class CreateSpaceModelDialog extends StatelessWidget {
          create: (_) {
            final bloc = CreateSpaceModelBloc(
              _spaceModelApi,
-              context.read<ProjectCubit>(),
            );
            if (spaceModel != null) {
              bloc.add(UpdateSpaceTemplate(spaceModel!, otherSpaceModels));
--- a/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
+++ b/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
@ -3,7 +3,7 @@ import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:intl/intl.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/custom_dialog.dart';
 import 'package:syncrow_web/pages/common/hour_picker_dialog.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_event.dart';
@ -14,14 +14,15 @@ import 'package:syncrow_web/pages/visitor_password/model/schedule_model.dart';
 import 'package:syncrow_web/services/access_mang_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';

 class VisitorPasswordBloc
    extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
-  final ProjectCubit projectCubit;

-  VisitorPasswordBloc(this.projectCubit) : super(VisitorPasswordInitial()) {
+  VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
    on<SelectUsageFrequency>(selectUsageFrequency);
    on<FetchDevice>(_onFetchDevice);
    on<SelectPasswordType>(selectAccessType);
@ -191,10 +192,9 @@ class VisitorPasswordBloc
      FetchDevice event, Emitter<VisitorPasswordState> emit) async {
    try {
      emit(DeviceLoaded());
-      final projectUuid = projectCubit.state;
+         final projectUuid = await ProjectManager.getProjectUUID() ?? '';

-      data = await AccessMangApi()
-          .fetchDevices(projectUuid ?? TempConst.projectId);
+      data = await AccessMangApi().fetchDevices(projectUuid);
      emit(TableLoaded(data));
    } catch (e) {
      emit(FailedState(e.toString()));
--- a/lib/pages/visitor_password/model/device_model.dart
+++ b/lib/pages/visitor_password/model/device_model.dart
@ -23,6 +23,7 @@ class DeviceModel {
  dynamic timeZone;
  dynamic updateTime;
  dynamic uuid;
+  dynamic spaceName;

  DeviceModel({
    required this.productUuid,
@ -45,6 +46,7 @@ class DeviceModel {
    required this.timeZone,
    required this.updateTime,
    required this.uuid,
+    required this.spaceName,
  });

  // Deserialize from JSON
@ -53,7 +55,8 @@ class DeviceModel {
    DeviceType type = devicesTypesMap[json['productType']] ?? DeviceType.Other;
    if (type == DeviceType.LightBulb) {
      tempIcon = Assets.lightBulb;
-    } else if (type == DeviceType.CeilingSensor || type == DeviceType.WallSensor) {
+    } else if (type == DeviceType.CeilingSensor ||
+        type == DeviceType.WallSensor) {
      tempIcon = Assets.sensors;
    } else if (type == DeviceType.AC) {
      tempIcon = Assets.ac;
@ -102,6 +105,7 @@ class DeviceModel {
      timeZone: json['timeZone'],
      updateTime: json['updateTime'],
      uuid: json['uuid'],
+      spaceName: json['spaceName'],
    );
  }

@ -128,6 +132,7 @@ class DeviceModel {
      'timeZone': timeZone,
      'updateTime': updateTime,
      'uuid': uuid,
+      'spaceName': spaceName
    };
  }
 }
--- a/lib/pages/visitor_password/view/add_device_dialog.dart
+++ b/lib/pages/visitor_password/view/add_device_dialog.dart
@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/common/access_device_table.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
@ -20,7 +20,8 @@ class AddDeviceDialog extends StatelessWidget {
  Widget build(BuildContext context) {
    Size size = MediaQuery.of(context).size;
    return BlocProvider(
-      create: (context) => VisitorPasswordBloc(context.read<ProjectCubit>())..add(FetchDevice()),
+      create: (context) =>
+          VisitorPasswordBloc()..add(FetchDevice()),
      child: BlocBuilder<VisitorPasswordBloc, VisitorPasswordState>(
        builder: (BuildContext context, VisitorPasswordState state) {
          final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);
@ -36,10 +37,10 @@ class AddDeviceDialog extends StatelessWidget {
            backgroundColor: Colors.white,
            title: Text(
              'Add Accessible Device',
-              style: Theme.of(context)
-                  .textTheme
-                  .headlineLarge!
-                  .copyWith(fontWeight: FontWeight.w400, fontSize: 24, color: Colors.black),
+              style: Theme.of(context).textTheme.headlineLarge!.copyWith(
+                  fontWeight: FontWeight.w400,
+                  fontSize: 24,
+                  color: Colors.black),
            ),
            content: SizedBox(
              height: MediaQuery.of(context).size.height / 1.7,
@ -69,10 +70,13 @@ class AddDeviceDialog extends StatelessWidget {
                            ),
                            Text(
                              'Only online accessible devices can be added',
-                              style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  fontWeight: FontWeight.w400,
-                                  fontSize: 12,
-                                  color: ColorsManager.grayColor),
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall!
+                                  .copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 12,
+                                      color: ColorsManager.grayColor),
                            ),
                          ],
                        )),
@ -153,7 +157,8 @@ class AddDeviceDialog extends StatelessWidget {
                                visitorBloc.deviceNameController.clear();
                                visitorBloc.deviceIdController.clear();
                                visitorBloc.unitNameController.clear();
-                                visitorBloc.add(FetchDevice()); // Reset to original list
+                                visitorBloc.add(
+                                    FetchDevice()); // Reset to original list
                              },
                            ),
                          ),
@ -173,7 +178,8 @@ class AddDeviceDialog extends StatelessWidget {
                                selectAll: (p0) {
                                  visitorBloc.selectedDeviceIds.clear();
                                  for (var item in state.data) {
-                                    visitorBloc.add(SelectDeviceEvent(item.uuid));
+                                    visitorBloc
+                                        .add(SelectDeviceEvent(item.uuid));
                                  }
                                },
                                onRowSelected: (index, isSelected, row) {
@ -194,7 +200,7 @@ class AddDeviceDialog extends StatelessWidget {
                                    item.name.toString(),
                                    item.uuid.toString(),
                                    item.productType.toString(),
-                                    '',
+                                    item.spaceName.toString(),
                                    item.online.value.toString(),
                                  ];
                                }).toList(),
--- a/lib/pages/visitor_password/view/visitor_password_dialog.dart
+++ b/lib/pages/visitor_password/view/visitor_password_dialog.dart
@ -2,7 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/common/date_time_widget.dart';
 import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
@ -23,7 +23,7 @@ class VisitorPasswordDialog extends StatelessWidget {
    Size size = MediaQuery.of(context).size;
    var text = Theme.of(context).textTheme.bodySmall!.copyWith(color: Colors.black, fontSize: 13);
    return BlocProvider(
-      create: (context) => VisitorPasswordBloc(context.read<ProjectCubit>()),
+      create: (context) => VisitorPasswordBloc(),
      child: BlocListener<VisitorPasswordBloc, VisitorPasswordState>(
        listener: (context, state) {
          final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);
--- a/lib/services/user_permission.dart
+++ b/lib/services/user_permission.dart
@ -14,7 +14,7 @@ class UserPermissionApi {
  Future<List<RolesUserModel>> fetchUsers(String projectId) async {
    try {
      final response = await _httpService.get(
-        path: ApiEndpoints.getUsers.replaceAll('{projectUuid}', projectId),
+        path: ApiEndpoints.getUsers.replaceAll('{projectId}', projectId),
        showServerMessage: true,
        expectedResponseModel: (json) {
          debugPrint('fetchUsers Response: $json');
@ -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 ?? [];
@ -195,14 +192,10 @@ class UserPermissionApi {

  Future<bool> changeUserStatusById(userUuid, status, String projectUuid) async {
    try {
-      Map<String, dynamic> bodya = {
-        "disable": status,
-        "projectUuid": projectUuid
-      };
+      Map<String, dynamic> bodya = {"disable": status, "projectUuid": projectUuid};

      final response = await _httpService.put(
-        path: ApiEndpoints.changeUserStatus
-            .replaceAll("{invitedUserUuid}", userUuid),
+        path: ApiEndpoints.changeUserStatus.replaceAll("{invitedUserUuid}", userUuid),
        body: bodya,
        expectedResponseModel: (json) {
          return json['success'];
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@ -1,7 +1,7 @@
 import 'package:flutter_dotenv/flutter_dotenv.dart';

 abstract class ApiEndpoints {
-  static const String projectUuid = "0e62577c-06fa-41b9-8a92-99a21fbaf51c";
+  static const String projectUuid = "bcda711e-9fc2-4168-a05e-171b4026d1ff";
  static String baseUrl = dotenv.env['BASE_URL'] ?? '';
  static const String signUp = '/authentication/user/signup';
  static const String login = '/authentication/user/login';
@ -95,8 +95,8 @@ abstract class ApiEndpoints {
  static const String inviteUser = '/invite-user';

  static const String checkEmail = '/invite-user/check-email';
-  static const String getUsers = '/projects/{projectUuid}/user';
-  static const String getUserById = '/projects/{projectUuid}/user/{userUuid}';
+  static const String getUsers = '/projects/{projectId}/user';
+  static const String getUserById = '/projects/{projectId}/user/{userUuid}';
  static const String editUser = '/invite-user/{inviteUserUuid}';
  static const String deleteUser = '/invite-user/{inviteUserUuid}';
  static const String changeUserStatus = '/invite-user/{invitedUserUuid}/disable';
--- a/lib/utils/constants/strings_manager.dart
+++ b/lib/utils/constants/strings_manager.dart
@ -40,4 +40,5 @@ class StringsManager {
  static const String firstLaunch = "firstLaunch";
  static const String deleteScene = 'Delete Scene';
  static const String deleteAutomation = 'Delete Automation';
+  static const String projectKey = 'selected_project_uuid';
 }
--- a/lib/utils/constants/temp_const.dart
+++ b/lib/utils/constants/temp_const.dart
@ -1,3 +1,3 @@
 class TempConst {
-  static const projectId = '0e62577c-06fa-41b9-8a92-99a21fbaf51c';
+  static const projectId = 'bcda711e-9fc2-4168-a05e-171b4026d1ff';
 }
--- a/lib/utils/user_drop_down_menu.dart
+++ b/lib/utils/user_drop_down_menu.dart
@ -4,7 +4,7 @@ import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
-import 'package:syncrow_web/pages/common/bloc/project_cubit.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@ -220,10 +220,7 @@ class _UserDropdownMenuState extends State<UserDropdownMenu> {
                      ),
                      GestureDetector(
                        onTap: () {
-                          final projectCubit =
-                              BlocProvider.of<ProjectCubit>(context);
-
-                          AuthBloc.logout(context, projectCubit);
+                          AuthBloc.logout(context);
                          context.go(RoutesConst.auth);
                        },
                        child: SizedBox(
Author	SHA1	Message	Date
hannathkadher	7efd1c3c87	Fixed cursor issue	2025-02-20 11:34:24 +04:00
hannathkadher	7a0d9aefb7	Merge pull request #95 from SyncrowIOT/bugfix/change-endpoint-prod fix endpoints	2025-02-19 18:01:11 +04:00
hannathkadher	21cc25cfc4	fix endpoints	2025-02-19 17:58:53 +04:00
Abdullah Alassaf	e2ec4bbf31	Pulled main changes	2025-02-18 16:27:09 +03:00
Abdullah Alassaf	51b46ae197	Merged with dev	2025-02-18 16:25:33 +03:00
Abdullah Alassaf	0c2a092f4d	Added side tree to space model	2025-02-18 12:31:43 +03:00
hannathkadher	b968b5a6eb	Merge pull request #92 from SyncrowIOT/bugfix/change-project-cubit Bugfix/change-project-cubit	2025-02-18 13:22:12 +04:00
hannathkadher	05edc7641a	removed project cubit from all classes	2025-02-18 12:56:51 +04:00
hannathkadher	b8204f1015	changed project class to use shared preference	2025-02-18 12:56:25 +04:00
mohammadnemer1	d87fec796b	Merge pull request #91 from SyncrowIOT/add_space_name spaceName	2025-02-17 12:56:47 +03:00
mohammad	b00b0c82dc	spaceName	2025-02-17 12:36:04 +03:00
Abdullah Alassaf	0aa029a2fc	Removed static space id and community id in the routine	2025-02-17 03:32:40 +03:00
Abdullah	dec3a25639	Merge pull request #90 from SyncrowIOT/feat/use-project-uuid-instead-of-hardcode Feat/use project UUID instead of hardcode	2025-02-17 01:11:53 +03:00
mohammad	36ee22603a	fixes CommunityId and spaceUuid	2025-02-10 12:44:35 +03:00
mohammad	b0abd42b0c	projectId	2025-02-06 11:28:40 +03:00
mohammad	ba4da78846	Merge branch 'dev'	2025-02-06 11:20:34 +03:00
Abdullah	dc20d69f20	Merge pull request #88 from SyncrowIOT/dev Dev	2025-02-06 01:03:32 +03:00
Abdullah Alassaf	cf6ec231dc	Merged with dev	2025-02-06 00:57:29 +03:00
Abdullah Alassaf	d0530f7fc3	Added staging space and community IDs	2024-12-04 09:57:29 +03:00