Fixed cursor issue

fix endpoints

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,14 +48,17 @@ 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();
+    if (_isOpen && _overlayEntry != null) {
+      _overlayEntry!.remove();
+      _overlayEntry = null;
       _isOpen = false;
     }
+  }
 
   OverlayEntry _createOverlayEntry() {
     final renderBox = context.findRenderObject() as RenderBox;
@@ -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(
+                    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 Container(
-                          decoration: const BoxDecoration(
-                            border: Border(
-                              bottom: BorderSide(
-                                color: ColorsManager.lightGrayBorderColor,
-                                width: 1.0,
-                              ),
-                            ),
-                          ),
-                          child: ListTile(
+                            return ListTile(
                               title: Text(item,
                                   style: Theme.of(context)
                                       .textTheme
                                       .bodyMedium
                                       ?.copyWith(
-                                        color: ColorsManager.textPrimaryColor)),
+                                          color:
+                                              ColorsManager.textPrimaryColor)),
                               onTap: () {
                                 _controller.text = item;
                                 widget.onSelected(item);
-                              setState(() {
-                                _filteredItems
-                                    .remove(item); // Remove selected 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),
+            ),
           ],
         ),
       ),

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';
@@ -25,15 +23,12 @@ Future<void> main() async {
     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,16 +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(

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));

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));

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();
   }
 }

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);
-  }
-}

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);
+  }
+}

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));
           }
         }
       }

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';
@@ -21,7 +21,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
       providers: [
         BlocProvider(
           create: (context) =>
-              DeviceManagementBloc(context.read<ProjectCubit>())..add(FetchDevices(context)),
+              DeviceManagementBloc()..add(FetchDevices(context)),
         ),
       ],
       child: WebScaffold(

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());

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"),

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

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>(

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) {

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)),

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());
       }

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});
 

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

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -3,7 +3,7 @@ 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';
@@ -16,7 +16,9 @@ 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';
@@ -28,9 +30,7 @@ part 'routine_state.dart';
 // 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);
@@ -163,14 +163,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       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 ?? TempConst.projectId));
+          scenes.addAll(await SceneApi.getScenes(spaceId, communityId, projectUuid));
         }
       }
 
@@ -839,7 +839,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
-      final projectUuid = projectCubit.state;
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       List<AllDevicesModel> devices = [];
 
       BuildContext context = NavigationService.navigatorKey.currentContext!;
@@ -847,8 +848,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       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 ?? TempConst.projectId));
+          devices
+              .addAll(await DevicesManagementApi().fetchDevices(communityId, spaceId, projectUuid));
         }
       }
 

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -1,23 +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;
   final TextEditingController textController = TextEditingController();
 
   // String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
   // String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
 
-  SpaceTreeBloc(this.projectCubit) : super(const SpaceTreeState()) {
+  SpaceTreeBloc() : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
     on<OnCommunityExpanded>(_onCommunityExpanded);
     on<OnSpaceExpanded>(_onSpaceExpanded);
@@ -29,15 +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);
+          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,

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 {

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(

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(
+            ? 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 ?? [],

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));

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;

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));

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()));

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';
@@ -21,7 +21,7 @@ class AddDeviceDialog extends StatelessWidget {
     Size size = MediaQuery.of(context).size;
     return BlocProvider(
       create: (context) =>
-          VisitorPasswordBloc(context.read<ProjectCubit>())..add(FetchDevice()),
+          VisitorPasswordBloc()..add(FetchDevice()),
       child: BlocBuilder<VisitorPasswordBloc, VisitorPasswordState>(
         builder: (BuildContext context, VisitorPasswordState state) {
           final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);

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);

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'];

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';

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';
 }

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';
 }

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(