Merge branch 'dev' into revert-SP-1589

.env.development

@@ -1,3 +1,2 @@
 ENV_NAME=development
 BASE_URL=https://syncrow-dev.azurewebsites.net
-RTDB_URL=https://syncrow-dev-79446.asia-southeast1.firebasedatabase.app/

.env.production

@@ -1,3 +1,2 @@
 ENV_NAME=production
 BASE_URL=https://syncrow-staging.azurewebsites.net
-RTDB_URL=https://syncrow-prod-79446.asia-southeast1.firebasedatabase.app/

.env.staging

@@ -1,3 +1,2 @@
 ENV_NAME=staging
 BASE_URL=https://syncrow-staging.azurewebsites.net
-RTDB_URL=https://syncrow-staging-79446.asia-southeast1.firebasedatabase.app/

.vscode/launch.json

@@ -1,9 +1,14 @@
 {
     "configurations": [
+      
         {
+ 
             "name": "DEVELOPMENT",
+       
             "request": "launch",
+       
             "type": "dart",
+       
             "args": [
               "-d",
               "chrome",
@@ -11,14 +16,19 @@
               "3000",
               "-t",
               "lib/main_dev.dart",
-        "--web-experimental-hot-reload"
+              "--web-experimental-hot-reload",
             ],
+       
             "flutterMode": "debug"
-    },
+       
-    {
+          },{
+ 
             "name": "STAGING",
+       
             "request": "launch",
+       
             "type": "dart",
+       
             "args": [
                 "-d",
                 "chrome",
@@ -26,14 +36,19 @@
                 "3000",
                 "-t",
                 "lib/main_staging.dart",
-        "--web-experimental-hot-reload"
+                "--web-experimental-hot-reload",
             ],
+       
             "flutterMode": "debug"
-    },
+       
-    {
+          },{
+ 
             "name": "PRODUCTION",
+       
             "request": "launch",
+       
             "type": "dart",
+       
             "args": [
               "-d",
               "chrome",
@@ -41,9 +56,12 @@
               "3000",
               "-t",
               "lib/main.dart",
-        "--web-experimental-hot-reload"
+              "--web-experimental-hot-reload",
             ],
+       
             "flutterMode": "debug"
-    }
+       
+          },
+
     ]
 }

assets/icons/x_delete.svg

@@ -1,5 +0,0 @@
-<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.5 34.9999C27.1649 34.9999 34.9999 27.1649 34.9999 17.4999C34.9999 7.83499 27.1649 0 17.5 0C7.83499 0 0 7.83499 0 17.5C0 27.1651 7.83499 34.9999 17.5 34.9999Z" fill="#FF6465"/>
-<path opacity="0.1" d="M4.70804 17.5C4.70804 8.63343 11.3024 1.30805 19.854 0.158115C19.0839 0.0545507 18.2984 0 17.5 0C7.835 0 0 7.835 0 17.5C0 27.1651 7.83499 35 17.4999 35C18.2983 35 19.0839 34.9455 19.8539 34.8419C11.3024 33.6919 4.70804 26.3665 4.70804 17.5Z" fill="black"/>
-<path d="M21.4229 17.5003L26.0301 12.8931C26.365 12.5582 26.365 12.0152 26.0301 11.6804L23.3197 8.96992C22.9848 8.63503 22.4418 8.63503 22.107 8.96992L17.4997 13.5772L12.8924 8.96992C12.5576 8.63503 12.0146 8.63503 11.6798 8.96992L8.96931 11.6804C8.63442 12.0153 8.63442 12.5582 8.96931 12.8931L13.5766 17.5003L8.96931 22.1076C8.63442 22.4425 8.63442 22.9855 8.96931 23.3204L11.6798 26.0308C12.0146 26.3657 12.5576 26.3657 12.8924 26.0308L17.4997 21.4235L22.1071 26.0308C22.442 26.3657 22.9849 26.3657 23.3198 26.0308L26.0302 23.3204C26.3651 22.9855 26.3651 22.4425 26.0302 22.1076L21.4229 17.5003Z" fill="white"/>
-</svg>

firebase.json

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

lib/firebase_options.dart

@@ -1,16 +0,0 @@
-import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-
-final class DefaultFirebaseOptions extends FirebaseOptions {
-  const DefaultFirebaseOptions({
-    required String databaseUrl,
-  }) : super(
-          apiKey: 'AIzaSyDgq5ywsnFVbbQO-Xz1Z4sR5bBcuiDaS9g',
-          appId: '1:255001682464:web:a03e2d6214c13101561245',
-          messagingSenderId: '255001682464',
-          projectId: 'syncrow-prod-79446',
-          authDomain: 'syncrow-prod-79446.firebaseapp.com',
-          storageBucket: 'syncrow-prod-79446.firebasestorage.app',
-          databaseURL: databaseUrl,
-          measurementId: 'G-1850Q89RMK',
-        );
-}

lib/firebase_options_dev.dart

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

lib/firebase_options_prod.dart

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

lib/main.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
-import 'package:syncrow_web/firebase_options.dart';
+import 'package:syncrow_web/firebase_options_prod.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
@@ -27,9 +27,7 @@ Future<void> main() async {
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions(
+      options: DefaultFirebaseOptionsStaging.currentPlatform,
-        databaseUrl: dotenv.env['RTDB_URL']!,
-      ),
     );
     initialSetup();
   } catch (_) {}
@@ -61,7 +59,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),

lib/main_dev.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
-import 'package:syncrow_web/firebase_options.dart';
+import 'package:syncrow_web/firebase_options_dev.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
@@ -27,9 +27,7 @@ Future<void> main() async {
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions(
+      options: DefaultFirebaseOptionsDev.currentPlatform,
-        databaseUrl: dotenv.env['RTDB_URL']!,
-      ),
     );
     initialSetup();
   } catch (_) {}
@@ -61,7 +59,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),

lib/main_staging.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
-import 'package:syncrow_web/firebase_options.dart';
+import 'package:syncrow_web/firebase_options_prod.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
@@ -24,9 +24,7 @@ Future<void> main() async {
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptions(
+      options: DefaultFirebaseOptionsStaging.currentPlatform,
-        databaseUrl: dotenv.env['RTDB_URL']!,
-      ),
     );
     initialSetup();
   } catch (_) {}
@@ -58,7 +56,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),

lib/pages/access_management/booking_system/data/services/remote_calendar_service.dart

@@ -1,170 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/calendar_event_booking.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/services/calendar_system_service.dart';
-import 'package:syncrow_web/services/api/api_exception.dart';
-import 'package:syncrow_web/services/api/http_service.dart';
-import 'package:syncrow_web/utils/constants/api_const.dart';
-
-class RemoteCalendarService implements CalendarSystemService {
-  const RemoteCalendarService(this._httpService);
-
-  final HTTPService _httpService;
-  static const _defaultErrorMessage = 'Failed to load Calendar';
-
-  @override
-  Future<CalendarEventsResponse> getCalendarEvents({
-    required String spaceId,
-  }) async {
-    try {
-      final response = await _httpService.get(
-        path: ApiEndpoints.getCalendarEvents,
-        queryParameters: {
-          'spaceId': spaceId,
-        },
-        expectedResponseModel: (json) {
-          return CalendarEventsResponse.fromJson(
-            json as Map<String, dynamic>,
-          );
-        },
-      );
-
-      return CalendarEventsResponse.fromJson(response as Map<String, dynamic>);
-    } on DioException catch (e) {
-      final responseData = e.response?.data;
-      if (responseData is Map<String, dynamic>) {
-        final errorMessage = responseData['error']?['message'] as String? ??
-            responseData['message'] as String? ??
-            _defaultErrorMessage;
-        throw APIException(errorMessage);
-      }
-      throw APIException(_defaultErrorMessage);
-    } catch (e) {
-      throw APIException('$_defaultErrorMessage: ${e.toString()}');
-    }
-  }
-}
-
-class FakeRemoteCalendarService implements CalendarSystemService {
-  const FakeRemoteCalendarService(this._httpService, {this.useDummy = false});
-
-  final HTTPService _httpService;
-  final bool useDummy;
-  static const _defaultErrorMessage = 'Failed to load Calendar';
-
-  @override
-  Future<CalendarEventsResponse> getCalendarEvents({
-    required String spaceId,
-  }) async {
-    if (useDummy) {
-      final dummyJson = {
-        'statusCode': 200,
-        'message': 'Successfully fetched all bookings',
-        'data': [
-          {
-            'uuid': 'd4553fa6-a0c9-4f42-81c9-99a13a57bf80',
-            'date': '2025-07-11T10:22:00.626Z',
-            'startTime': '09:00:00',
-            'endTime': '12:00:00',
-            'cost': 10,
-            'user': {
-              'uuid': '784394ff-3197-4c39-9f07-48dc44920b1e',
-              'firstName': 'salsabeel',
-              'lastName': 'abuzaid',
-              'email': 'test@test.com',
-              'companyName': null
-            },
-            'space': {
-              'uuid': '000f4d81-43e4-4ad7-865c-0f8b04b7081e',
-              'spaceName': '2(1)'
-            }
-          },
-          {
-            'uuid': 'e9b27af0-b963-4d98-9657-454c4ba78561',
-            'date': '2025-07-11T10:22:00.626Z',
-            'startTime': '12:00:00',
-            'endTime': '13:00:00',
-            'cost': 10,
-            'user': {
-              'uuid': '784394ff-3197-4c39-9f07-48dc44920b1e',
-              'firstName': 'salsabeel',
-              'lastName': 'abuzaid',
-              'email': 'test@test.com',
-              'companyName': null
-            },
-            'space': {
-              'uuid': '000f4d81-43e4-4ad7-865c-0f8b04b7081e',
-              'spaceName': '2(1)'
-            }
-          },
-          {
-            'uuid': 'e9b27af0-b963-4d98-9657-454c4ba78561',
-            'date': '2025-07-13T10:22:00.626Z',
-            'startTime': '15:30:00',
-            'endTime': '19:00:00',
-            'cost': 20,
-            'user': {
-              'uuid': '784394ff-3197-4c39-9f07-48dc44920b1e',
-              'firstName': 'salsabeel',
-              'lastName': 'abuzaid',
-              'email': 'test@test.com',
-              'companyName': null
-            },
-            'space': {
-              'uuid': '000f4d81-43e4-4ad7-865c-0f8b04b7081e',
-              'spaceName': '2(1)'
-            }
-          }
-        ],
-        'success': true
-      };
-      final response = CalendarEventsResponse.fromJson(dummyJson);
-
-      // Filter events by spaceId
-      final filteredData = response.data.where((event) {
-        return event.space.uuid == spaceId;
-      }).toList();
-      print('Filtering events for spaceId: $spaceId');
-      print('Found ${filteredData.length} matching events');
-      return filteredData.isNotEmpty
-          ? CalendarEventsResponse(
-              statusCode: response.statusCode,
-              message: response.message,
-              data: filteredData,
-              success: response.success,
-            )
-          : CalendarEventsResponse(
-              statusCode: 404,
-              message: 'No events found for spaceId: $spaceId',
-              data: [],
-              success: false,
-            );
-    }
-
-    try {
-      final response = await _httpService.get(
-        path: ApiEndpoints.getCalendarEvents,
-        queryParameters: {
-          'spaceId': spaceId,
-        },
-        expectedResponseModel: (json) {
-          return CalendarEventsResponse.fromJson(
-            json as Map<String, dynamic>,
-          );
-        },
-      );
-
-      return CalendarEventsResponse.fromJson(response as Map<String, dynamic>);
-    } on DioException catch (e) {
-      final responseData = e.response?.data;
-      if (responseData is Map<String, dynamic>) {
-        final errorMessage = responseData['error']?['message'] as String? ??
-            responseData['message'] as String? ??
-            _defaultErrorMessage;
-        throw APIException(errorMessage);
-      }
-      throw APIException(_defaultErrorMessage);
-    } catch (e) {
-      throw APIException('$_defaultErrorMessage: ${e.toString()}');
-    }
-  }
-}

lib/pages/access_management/booking_system/domain/models/calendar_event_booking.dart

@@ -1,134 +0,0 @@
-class CalendarEventBooking {
-  final String uuid;
-  final DateTime date;
-  final String startTime;
-  final String endTime;
-  final int cost;
-  final BookingUser user;
-  final BookingSpace space;
-
-  CalendarEventBooking({
-    required this.uuid,
-    required this.date,
-    required this.startTime,
-    required this.endTime,
-    required this.cost,
-    required this.user,
-    required this.space,
-  });
-
-  factory CalendarEventBooking.fromJson(Map<String, dynamic> json) {
-    return CalendarEventBooking(
-      uuid: json['uuid'] as String? ?? '',
-      date: json['date'] != null
-          ? DateTime.parse(json['date'] as String)
-          : DateTime.now(),
-      startTime: json['startTime'] as String? ?? '',
-      endTime: json['endTime'] as String? ?? '',
-      cost: _parseInt(json['cost']),
-      user: json['user'] != null
-          ? BookingUser.fromJson(json['user'] as Map<String, dynamic>)
-          : BookingUser.empty(),
-      space: json['space'] != null
-          ? BookingSpace.fromJson(json['space'] as Map<String, dynamic>)
-          : BookingSpace.empty(),
-    );
-  }
-
-  static int _parseInt(dynamic value) {
-    if (value is int) return value;
-    if (value is String) return int.tryParse(value) ?? 0;
-    return 0;
-  }
-}
-
-class BookingUser {
-  final String uuid;
-  final String firstName;
-  final String lastName;
-  final String email;
-  final String? companyName;
-
-  BookingUser({
-    required this.uuid,
-    required this.firstName,
-    required this.lastName,
-    required this.email,
-    this.companyName,
-  });
-
-  factory BookingUser.fromJson(Map<String, dynamic> json) {
-    return BookingUser(
-      uuid: json['uuid'] as String? ?? '',
-      firstName: json['firstName'] as String? ?? '',
-      lastName: json['lastName'] as String? ?? '',
-      email: json['email'] as String? ?? '',
-      companyName: json['companyName'] as String?, 
-    );
-  }
-
-  factory BookingUser.empty() {
-    return BookingUser(
-      uuid: '',
-      firstName: '',
-      lastName: '',
-      email: '',
-      companyName: null,
-    );
-  }
-}
-
-class BookingSpace {
-  final String uuid;
-  final String spaceName;
-
-  BookingSpace({
-    required this.uuid,
-    required this.spaceName,
-  });
-
-  factory BookingSpace.fromJson(Map<String, dynamic> json) {
-    return BookingSpace(
-      uuid: json['uuid'] as String? ?? '',
-      spaceName: json['spaceName'] as String? ?? '',
-    );
-  }
-
-  factory BookingSpace.empty() {
-    return BookingSpace(
-      uuid: '',
-      spaceName: '',
-    );
-  }
-}
-
-class CalendarEventsResponse {
-  final int statusCode;
-  final String message;
-  final List<CalendarEventBooking> data;
-  final bool success;
-
-  CalendarEventsResponse({
-    required this.statusCode,
-    required this.message,
-    required this.data,
-    required this.success,
-  });
-
-  factory CalendarEventsResponse.fromJson(Map<String, dynamic> json) {
-    return CalendarEventsResponse(
-      statusCode: _parseInt(json['statusCode']),
-      message: json['message'] as String? ?? '',
-      data: (json['data'] as List? ?? [])
-          .map((e) => CalendarEventBooking.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      success: json['success'] as bool? ?? false,
-    );
-  }
-}
-
-int _parseInt(dynamic value) {
-  if (value is int) return value;
-  if (value is String) return int.tryParse(value) ?? 0;
-  return 0;
-}

lib/pages/access_management/booking_system/domain/services/calendar_system_service.dart

@@ -1,7 +0,0 @@
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/calendar_event_booking.dart';
-
-abstract class CalendarSystemService {
-  Future<CalendarEventsResponse> getCalendarEvents({
-    required String spaceId,
-  });
-}

lib/pages/access_management/booking_system/presentation/bloc/calendar/events_bloc.dart

@@ -2,17 +2,13 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:calendar_view/calendar_view.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/calendar_event_booking.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/services/calendar_system_service.dart';
-
 part 'events_event.dart';
 part 'events_state.dart';
 
 class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
   final EventController eventController = EventController();
-  final CalendarSystemService calendarService;
 
-  CalendarEventsBloc({required this.calendarService}) : super(EventsInitial()) {
+  CalendarEventsBloc() : super(EventsInitial()) {
     on<LoadEvents>(_onLoadEvents);
     on<AddEvent>(_onAddEvent);
     on<StartTimer>(_onStartTimer);
@@ -26,24 +22,53 @@ class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
   ) async {
     emit(EventsLoading());
     try {
-      final response = await calendarService.getCalendarEvents(
+      final events = _generateDummyEventsForWeek(event.weekStart);
-        spaceId: event.spaceId,
-      );
-      final events =
-          response.data.map<CalendarEventData>(_toCalendarEventData).toList();
       eventController.addAll(events);
-      emit(EventsLoaded(events: events));
+      emit(EventsLoaded(
+        events: events,
+        initialDate: event.weekStart,
+        weekDays: _getWeekDays(event.weekStart),
+      ));
     } catch (e) {
       emit(EventsError('Failed to load events'));
     }
   }
 
+  List<CalendarEventData> _generateDummyEventsForWeek(DateTime weekStart) {
+    final events = <CalendarEventData>[];
+
+    for (int i = 0; i < 7; i++) {
+      final date = weekStart.add(Duration(days: i));
+
+      events.add(CalendarEventData(
+        date: date,
+        startTime: date.copyWith(hour: 9, minute: 0),
+        endTime: date.copyWith(hour: 10, minute: 30),
+        title: 'Team Meeting',
+        description: 'Daily standup',
+        color: Colors.blue,
+      ));
+      events.add(CalendarEventData(
+        date: date,
+        startTime: date.copyWith(hour: 14, minute: 0),
+        endTime: date.copyWith(hour: 15, minute: 0),
+        title: 'Client Call',
+        description: 'Project discussion',
+        color: Colors.green,
+      ));
+    }
+
+    return events;
+  }
+
   void _onAddEvent(AddEvent event, Emitter<CalendarEventState> emit) {
     eventController.add(event.event);
     if (state is EventsLoaded) {
       final loaded = state as EventsLoaded;
       emit(EventsLoaded(
         events: [...eventController.events],
+        initialDate: loaded.initialDate,
+        weekDays: loaded.weekDays,
       ));
     }
   }
@@ -61,44 +86,47 @@ class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
       final newWeekDays = _getWeekDays(event.weekDate);
       emit(EventsLoaded(
         events: loaded.events,
+        initialDate: event.weekDate,
+        weekDays: newWeekDays,
       ));
     }
   }
 
-  CalendarEventData _toCalendarEventData(CalendarEventBooking booking) {
+  List<CalendarEventData> _generateDummyEvents() {
-    final date = booking.date;
+    final now = DateTime.now();
-
+    return [
-    final localDate = date.toLocal();
+      CalendarEventData(
-
+        date: now,
-    final startParts = booking.startTime.split(':').map(int.parse).toList();
+        startTime: now.copyWith(hour: 8, minute: 00, second: 0),
-    final endParts = booking.endTime.split(':').map(int.parse).toList();
+        endTime: now.copyWith(hour: 9, minute: 00, second: 0),
-
+        title: 'Team Meeting',
-    final startTime = DateTime(
+        description: 'Weekly team sync',
-      localDate.year,
-      localDate.month,
-      localDate.day,
-      startParts[0],
-      startParts[1],
-    );
-
-    final endTime = DateTime(
-      localDate.year,
-      localDate.month,
-      localDate.day,
-      endParts[0],
-      endParts[1],
-    );
-
-    return CalendarEventData(
-      date: startTime, 
-      startTime: startTime,
-      endTime: endTime,
-      title:
-          '${booking.space.spaceName} - ${booking.user.firstName} ${booking.user.lastName}',
-      description: 'Cost: ${booking.cost}',
         color: Colors.blue,
-      event: booking, 
+      ),
-    );
+      CalendarEventData(
+        date: now,
+        startTime: now.copyWith(hour: 9, minute: 00, second: 0),
+        endTime: now.copyWith(hour: 10, minute: 30, second: 0),
+        title: 'Team Meeting',
+        description: 'Weekly team sync',
+        color: Colors.blue,
+      ),
+      CalendarEventData(
+        date: now.add(const Duration(days: 1)),
+        startTime: now.copyWith(hour: 14, day: now.day + 1),
+        endTime: now.copyWith(hour: 15, day: now.day + 1),
+        title: 'Client Call',
+        description: 'Project discussion',
+        color: Colors.green,
+      ),
+      CalendarEventData(
+        date: now.add(const Duration(days: 2)),
+        startTime: now.copyWith(hour: 11, day: now.day + 2),
+        endTime: now.copyWith(hour: 12, day: now.day + 2),
+        title: 'Lunch with Team',
+        color: Colors.orange,
+      ),
+    ];
   }
 
   List<DateTime> _getWeekDays(DateTime date) {

lib/pages/access_management/booking_system/presentation/bloc/calendar/events_event.dart

@@ -6,20 +6,13 @@ abstract class CalendarEventsEvent {
 }
 
 class LoadEvents extends CalendarEventsEvent {
-  final String spaceId;
   final DateTime weekStart;
-  final DateTime weekEnd;
+  const LoadEvents({required this.weekStart});
-
-  const LoadEvents({
-    required this.spaceId,
-    required this.weekStart,
-    required this.weekEnd,
-  });
 }
 
 class AddEvent extends CalendarEventsEvent {
   final CalendarEventData event;
-  const AddEvent(this.event);
+  AddEvent(this.event);
 }
 
 class StartTimer extends CalendarEventsEvent {}
@@ -30,8 +23,3 @@ class GoToWeek extends CalendarEventsEvent {
   final DateTime weekDate;
   GoToWeek(this.weekDate);
 }
-
-class CheckWeekHasEvents extends CalendarEventsEvent {
-  final DateTime weekStart;
-  const CheckWeekHasEvents(this.weekStart);
-}

lib/pages/access_management/booking_system/presentation/bloc/calendar/events_state.dart

@@ -9,9 +9,13 @@ class EventsLoading extends CalendarEventState {}
 
 class EventsLoaded extends CalendarEventState {
   final List<CalendarEventData> events;
+  final DateTime initialDate;
+  final List<DateTime> weekDays;
 
   EventsLoaded({
     required this.events,
+    required this.initialDate,
+    required this.weekDays,
   });
 }
 

lib/pages/access_management/booking_system/presentation/view/booking_page.dart

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:intl/intl.dart';
 import 'package:calendar_view/calendar_view.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/data/services/remote_calendar_service.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/calendar/events_bloc.dart';
 import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_bloc.dart';
 import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_event.dart';
 import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_state.dart';
@@ -10,9 +9,7 @@ import 'package:syncrow_web/pages/access_management/booking_system/presentation/
 import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/booking_sidebar.dart';
 import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/custom_calendar_page.dart';
 import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/icon_text_button.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/week_navigation.dart';
 import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/weekly_calendar_page.dart';
-import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
@@ -38,20 +35,33 @@ class _BookingPageState extends State<BookingPage> {
     super.dispose();
   }
 
-  void _dispatchLoadEvents(BuildContext context) {
+  List<CalendarEventData> _generateDummyEventsForWeek(DateTime weekStart) {
-    final selectedRoom =
+    final List<CalendarEventData> events = [];
-        context.read<SelectedBookableSpaceBloc>().state.selectedBookableSpace;
+    for (int i = 0; i < 7; i++) {
-    final dateState = context.read<DateSelectionBloc>().state;
+      final date = weekStart.add(Duration(days: i));
-
+      events.add(CalendarEventData(
-    if (selectedRoom != null) {
+        date: date,
-      context.read<CalendarEventsBloc>().add(
+        startTime: date.copyWith(hour: 9, minute: 0),
-            LoadEvents(
+        endTime: date.copyWith(hour: 10, minute: 30),
-              spaceId: selectedRoom.uuid,
+        title: 'Team Meeting',
-              weekStart: dateState.weekStart,
+        description: 'Daily standup',
-              weekEnd: dateState.weekStart.add(const Duration(days: 6)),
+        color: Colors.blue,
-            ),
+      ));
-          );
+      events.add(CalendarEventData(
+        date: date,
+        startTime: date.copyWith(hour: 14, minute: 0),
+        endTime: date.copyWith(hour: 15, minute: 0),
+        title: 'Client Call',
+        description: 'Project discussion',
+        color: Colors.green,
+      ));
     }
+    return events;
+  }
+
+  void _loadEventsForWeek(DateTime weekStart) {
+    _eventController.removeWhere((_) => true);
+    _eventController.addAll(_generateDummyEventsForWeek(weekStart));
   }
 
   @override
@@ -60,28 +70,13 @@ class _BookingPageState extends State<BookingPage> {
       providers: [
         BlocProvider(create: (_) => SelectedBookableSpaceBloc()),
         BlocProvider(create: (_) => DateSelectionBloc()),
-        BlocProvider(
-          create: (_) => CalendarEventsBloc(
-            calendarService:
-                FakeRemoteCalendarService(HTTPService(), useDummy: true),
-          ),
-        ),
       ],
-      child: Builder(
-        builder: (context) =>
-            BlocListener<CalendarEventsBloc, CalendarEventState>(
-          listenWhen: (prev, curr) => curr is EventsLoaded,
-          listener: (context, state) {
-            if (state is EventsLoaded) {
-              _eventController.removeWhere((_) => true);
-              _eventController.addAll(state.events);
-            }
-          },
-          child: BlocListener<SelectedBookableSpaceBloc,
-              SelectedBookableSpaceState>(
-            listener: (context, state) => _dispatchLoadEvents(context),
       child: BlocListener<DateSelectionBloc, DateSelectionState>(
-              listener: (context, state) => _dispatchLoadEvents(context),
+        listenWhen: (previous, current) =>
+            previous.weekStart != current.weekStart,
+        listener: (context, state) {
+          _loadEventsForWeek(state.weekStart);
+        },
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -116,8 +111,7 @@ class _BookingPageState extends State<BookingPage> {
                       ),
                     ),
                     Expanded(
-                            child: BlocBuilder<DateSelectionBloc,
+                      child: BlocBuilder<DateSelectionBloc, DateSelectionState>(
-                                DateSelectionState>(
                         builder: (context, dateState) {
                           return CustomCalendarPage(
                             selectedDate: dateState.selectedDate,
@@ -126,8 +120,9 @@ class _BookingPageState extends State<BookingPage> {
                               context
                                   .read<DateSelectionBloc>()
                                   .add(SelectDate(newDate));
-                                    context.read<DateSelectionBloc>().add(
+                              context
-                                        SelectDateFromSidebarCalendar(newDate));
+                                  .read<DateSelectionBloc>()
+                                  .add(SelectDateFromSidebarCalendar(newDate));
                             },
                           );
                         },
@@ -162,25 +157,59 @@ class _BookingPageState extends State<BookingPage> {
                             ),
                           ],
                         ),
-                              BlocBuilder<DateSelectionBloc,
+                        BlocBuilder<DateSelectionBloc, DateSelectionState>(
-                                  DateSelectionState>(
                           builder: (context, state) {
                             final weekStart = state.weekStart;
                             final weekEnd =
                                 weekStart.add(const Duration(days: 6));
-                                  return WeekNavigation(
+                            return Container(
-                                    weekStart: weekStart,
+                              padding: const EdgeInsets.symmetric(
-                                    weekEnd: weekEnd,
+                                  horizontal: 10, vertical: 5),
-                                    onPreviousWeek: () {
+                              decoration: BoxDecoration(
+                                color: ColorsManager.circleRolesBackground,
+                                borderRadius: BorderRadius.circular(10),
+                                boxShadow: const [
+                                  BoxShadow(
+                                    color: ColorsManager.lightGrayColor,
+                                    blurRadius: 4,
+                                    offset: Offset(0, 1),
+                                  ),
+                                ],
+                              ),
+                              child: Row(
+                                children: [
+                                  IconButton(
+                                    iconSize: 15,
+                                    icon: const Icon(Icons.arrow_back_ios,
+                                        color: ColorsManager.lightGrayColor),
+                                    onPressed: () {
                                       context
                                           .read<DateSelectionBloc>()
                                           .add(PreviousWeek());
                                     },
-                                    onNextWeek: () {
+                                  ),
+                                  const SizedBox(width: 10),
+                                  Text(
+                                    _getMonthYearText(weekStart, weekEnd),
+                                    style: const TextStyle(
+                                      color: ColorsManager.lightGrayColor,
+                                      fontSize: 14,
+                                      fontWeight: FontWeight.w400,
+                                    ),
+                                  ),
+                                  const SizedBox(width: 10),
+                                  IconButton(
+                                    iconSize: 15,
+                                    icon: const Icon(Icons.arrow_forward_ios,
+                                        color: ColorsManager.lightGrayColor),
+                                    onPressed: () {
                                       context
                                           .read<DateSelectionBloc>()
                                           .add(NextWeek());
                                     },
+                                  ),
+                                ],
+                              ),
                             );
                           },
                         ),
@@ -190,27 +219,14 @@ class _BookingPageState extends State<BookingPage> {
                       child: BlocBuilder<SelectedBookableSpaceBloc,
                           SelectedBookableSpaceState>(
                         builder: (context, roomState) {
-                                final selectedRoom =
+                          final selectedRoom = roomState.selectedBookableSpace;
-                                    roomState.selectedBookableSpace;
                           return BlocBuilder<DateSelectionBloc,
                               DateSelectionState>(
                             builder: (context, dateState) {
-                                    return BlocListener<CalendarEventsBloc,
+                              return WeeklyCalendarPage(
-                                        CalendarEventState>(
+                                startTime:
-                                      listenWhen: (prev, curr) =>
+                                    selectedRoom?.bookableConfig.startTime,
-                                          curr is EventsLoaded,
+                                endTime: selectedRoom?.bookableConfig.endTime,
-                                      listener: (context, state) {
-                                        if (state is EventsLoaded) {
-                                          _eventController
-                                              .removeWhere((_) => true);
-                                          _eventController.addAll(state.events);
-                                        }
-                                      },
-                                      child: WeeklyCalendarPage(
-                                        startTime: selectedRoom
-                                            ?.bookableConfig.startTime,
-                                        endTime: selectedRoom
-                                            ?.bookableConfig.endTime,
                                 weekStart: dateState.weekStart,
                                 selectedDate: dateState.selectedDate,
                                 eventController: _eventController,
@@ -218,7 +234,6 @@ class _BookingPageState extends State<BookingPage> {
                                     .watch<DateSelectionBloc>()
                                     .state
                                     .selectedDateFromSideBarCalender,
-                                      ),
                               );
                             },
                           );
@@ -232,9 +247,20 @@ class _BookingPageState extends State<BookingPage> {
           ],
         ),
       ),
-          ),
-        ),
-      ),
     );
   }
+
+  String _getMonthYearText(DateTime start, DateTime end) {
+    final startMonth = DateFormat('MMM').format(start);
+    final endMonth = DateFormat('MMM').format(end);
+    final year = start.year == end.year
+        ? start.year.toString()
+        : '${start.year}-${end.year}';
+
+    if (start.month == end.month) {
+      return '$startMonth $year';
+    } else {
+      return '$startMonth - $endMonth $year';
+    }
+  }
 }

lib/pages/access_management/booking_system/presentation/view/widgets/event_tile_widget.dart

@@ -1,60 +0,0 @@
-import 'package:calendar_view/calendar_view.dart';
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class EventTileWidget extends StatelessWidget {
-  final List<CalendarEventData<Object?>> events;
-
-  const EventTileWidget({
-    super.key,
-    required this.events,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      margin: const EdgeInsets.symmetric(vertical: 2, horizontal: 2),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: events.map((event) {
-          final bool isEventEnded =
-              event.endTime != null && event.endTime!.isBefore(DateTime.now());
-          return Expanded(
-            child: Container(
-              width: double.infinity,
-              padding: const EdgeInsets.all(6),
-              decoration: BoxDecoration(
-                color: isEventEnded
-                    ? ColorsManager.lightGrayBorderColor
-                    : ColorsManager.blue1.withOpacity(0.25),
-                borderRadius: BorderRadius.circular(6),
-              ),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    DateFormat('h:mm a').format(event.startTime!),
-                    style: const TextStyle(
-                      fontWeight: FontWeight.bold,
-                      fontSize: 12,
-                      color: Colors.black87,
-                    ),
-                  ),
-                  const SizedBox(height: 2),
-                  Text(
-                    event.title,
-                    style: const TextStyle(
-                      fontSize: 12,
-                      color: ColorsManager.blackColor,
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          );
-        }).toList(),
-      ),
-    );
-  }
-}

lib/pages/access_management/booking_system/presentation/view/widgets/hatched_column_background.dart

@@ -1,91 +0,0 @@
-import 'package:flutter/material.dart';
-import 'dart:math' as math;
-
-class HatchedColumnBackground extends StatelessWidget {
-  final Color backgroundColor;
-  final Color lineColor;
-  final double opacity;
-  final double stripeSpacing;
-  final BorderRadius? borderRadius;
-
-  const HatchedColumnBackground({
-    super.key,
-    required this.backgroundColor,
-    required this.lineColor,
-    this.opacity = 0.15,
-    this.stripeSpacing = 12,
-    this.borderRadius,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return CustomPaint(
-      painter: _HatchedBackgroundPainter(
-        backgroundColor: backgroundColor,
-        opacity: opacity,
-        lineColor: lineColor,
-        stripeSpacing: stripeSpacing,
-        borderRadius: borderRadius,
-      ),
-      size: Size.infinite,
-    );
-  }
-}
-
-class _HatchedBackgroundPainter extends CustomPainter {
-  final Color backgroundColor;
-  final double opacity;
-  final Color lineColor;
-  final double stripeSpacing;
-  final BorderRadius? borderRadius;
-
-  _HatchedBackgroundPainter({
-    required this.backgroundColor,
-    required this.opacity,
-    required this.lineColor,
-    required this.stripeSpacing,
-    this.borderRadius,
-  });
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final rect = Rect.fromLTWH(0, 0, size.width, size.height);
-    final RRect rrect = borderRadius?.toRRect(rect) ??
-        RRect.fromRectAndRadius(rect, Radius.zero);
-    final backgroundPaint = Paint()
-      ..color = backgroundColor.withOpacity(0.02)
-      ..style = PaintingStyle.fill;
-    canvas.drawRRect(rrect, backgroundPaint);
-    canvas.save();
-    canvas.clipRRect(rrect);
-    final linePaint = Paint()
-      ..color = lineColor
-      ..strokeWidth = 0.5
-      ..style = PaintingStyle.stroke;
-    final maxExtent =
-        math.sqrt(size.width * size.width + size.height * size.height);
-
-    canvas.translate(0, size.height);
-    canvas.rotate(-math.pi / 4); 
-    double y = -maxExtent;
-    while (y < maxExtent) {
-      canvas.drawLine(
-        Offset(-maxExtent, y),
-        Offset(maxExtent, y),
-        linePaint,
-      );
-      y += stripeSpacing;
-    }
-
-    canvas.restore();
-  }
-
-  @override
-  bool shouldRepaint(covariant _HatchedBackgroundPainter oldDelegate) {
-    return backgroundColor != oldDelegate.backgroundColor ||
-        opacity != oldDelegate.opacity ||
-        lineColor != oldDelegate.lineColor ||
-        stripeSpacing != oldDelegate.stripeSpacing ||
-        borderRadius != oldDelegate.borderRadius;
-  }
-}

lib/pages/access_management/booking_system/presentation/view/widgets/time_line_widget.dart

@@ -1,49 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class TimeLineWidget extends StatelessWidget {
-  final DateTime date;
-
-  const TimeLineWidget({Key? key, required this.date}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    int hour =
-        date.hour == 0 ? 12 : (date.hour > 12 ? date.hour - 12 : date.hour);
-    String period = date.hour >= 12 ? 'PM' : 'AM';
-    return Container(
-      height: 60,
-      alignment: Alignment.center,
-      child: RichText(
-        text: TextSpan(
-          children: [
-            TextSpan(
-              text: '$hour',
-              style: const TextStyle(
-                fontWeight: FontWeight.w700,
-                fontSize: 24,
-                color: ColorsManager.blackColor,
-              ),
-            ),
-            WidgetSpan(
-              child: Padding(
-                padding: const EdgeInsets.only(left: 2, top: 6),
-                child: Text(
-                  period,
-                  style: const TextStyle(
-                    fontWeight: FontWeight.w400,
-                    fontSize: 12,
-                    color: ColorsManager.blackColor,
-                    letterSpacing: 1,
-                  ),
-                ),
-              ),
-              alignment: PlaceholderAlignment.baseline,
-              baseline: TextBaseline.alphabetic,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/pages/access_management/booking_system/presentation/view/widgets/week_day_header.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class WeekDayHeader extends StatelessWidget {
-  final DateTime date;
-  final bool isSelectedDay;
-
-  const WeekDayHeader({
-    Key? key,
-    required this.date,
-    required this.isSelectedDay,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Text(
-          DateFormat('EEE').format(date).toUpperCase(),
-          style: TextStyle(
-            fontWeight: FontWeight.w400,
-            fontSize: 14,
-            color: isSelectedDay ? Colors.blue : Colors.black,
-          ),
-        ),
-        Text(
-          DateFormat('d').format(date),
-          style: TextStyle(
-            fontWeight: FontWeight.w700,
-            fontSize: 20,
-            color:
-                isSelectedDay ? ColorsManager.blue1 : ColorsManager.blackColor,
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/pages/access_management/booking_system/presentation/view/widgets/week_navigation.dart

@@ -1,76 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class WeekNavigation extends StatelessWidget {
-  final DateTime weekStart;
-  final DateTime weekEnd;
-  final VoidCallback onPreviousWeek;
-  final VoidCallback onNextWeek;
-
-  const WeekNavigation({
-    Key? key,
-    required this.weekStart,
-    required this.weekEnd,
-    required this.onPreviousWeek,
-    required this.onNextWeek,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-      decoration: BoxDecoration(
-        color: ColorsManager.circleRolesBackground,
-        borderRadius: BorderRadius.circular(10),
-        boxShadow: const [
-          BoxShadow(
-            color: ColorsManager.lightGrayColor,
-            blurRadius: 4,
-            offset: Offset(0, 1),
-          ),
-        ],
-      ),
-      child: Row(
-        children: [
-          IconButton(
-            iconSize: 15,
-            icon: const Icon(Icons.arrow_back_ios,
-                color: ColorsManager.lightGrayColor),
-            onPressed: onPreviousWeek,
-          ),
-          const SizedBox(width: 10),
-          Text(
-            _getMonthYearText(weekStart, weekEnd),
-            style: const TextStyle(
-              color: ColorsManager.lightGrayColor,
-              fontSize: 14,
-              fontWeight: FontWeight.w400,
-            ),
-          ),
-          const SizedBox(width: 10),
-          IconButton(
-            iconSize: 15,
-            icon: const Icon(Icons.arrow_forward_ios,
-                color: ColorsManager.lightGrayColor),
-            onPressed: onNextWeek,
-          ),
-        ],
-      ),
-    );
-  }
-
-  String _getMonthYearText(DateTime start, DateTime end) {
-    final startMonth = DateFormat('MMM').format(start);
-    final endMonth = DateFormat('MMM').format(end);
-    final year = start.year == end.year
-        ? start.year.toString()
-        : '${start.year}-${end.year}';
-
-    if (start.month == end.month) {
-      return '$startMonth $year';
-    } else {
-      return '$startMonth - $endMonth $year';
-    }
-  }
-}

lib/pages/access_management/booking_system/presentation/view/widgets/weekly_calendar_page.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:calendar_view/calendar_view.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/event_tile_widget.dart';
+import 'package:intl/intl.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/hatched_column_background.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/time_line_widget.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/week_day_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class WeeklyCalendarPage extends StatelessWidget {
@@ -63,39 +60,18 @@ class WeeklyCalendarPage extends StatelessWidget {
 
     const double timeLineWidth = 80;
     const int totalDays = 7;
-    final DateTime highlightStart = DateTime(2025, 7, 10);
+
-    final DateTime highlightEnd = DateTime(2025, 7, 19);
     return LayoutBuilder(
       builder: (context, constraints) {
         final double calendarWidth = constraints.maxWidth;
         final double dayColumnWidth =
             (calendarWidth - timeLineWidth) / totalDays - 0.1;
-        bool isInRange(DateTime date, DateTime start, DateTime end) {
-          return !date.isBefore(start) && !date.isAfter(end);
-        }
 
         return Padding(
           padding: const EdgeInsets.only(left: 25.0, right: 25.0, top: 25),
           child: Stack(
             children: [
               WeekView(
-                weekDetectorBuilder: ({
-                  required date,
-                  required height,
-                  required heightPerMinute,
-                  required minuteSlotSize,
-                  required width,
-                }) {
-                  return isInRange(date, highlightStart, highlightEnd)
-                      ? HatchedColumnBackground(
-                          backgroundColor: ColorsManager.grey800,
-                          lineColor: ColorsManager.textGray,
-                          opacity: 0.3,
-                          stripeSpacing: 12,
-                          borderRadius: BorderRadius.circular(8),
-                        )
-                      : const SizedBox();
-                },
                 pageViewPhysics: const NeverScrollableScrollPhysics(),
                 key: ValueKey(weekStart),
                 controller: eventController,
@@ -112,13 +88,70 @@ class WeeklyCalendarPage extends StatelessWidget {
                   height: 0,
                 ),
                 weekDayBuilder: (date) {
-                  return WeekDayHeader(
+                  final index = weekDays.indexWhere((d) => isSameDay(d, date));
-                    date: date,
+                  final isSelectedDay = index == selectedDayIndex;
-                    isSelectedDay: isSameDay(date, selectedDate),
+                  return Column(
+                    children: [
+                      Text(
+                        DateFormat('EEE').format(date).toUpperCase(),
+                        style: TextStyle(
+                          fontWeight: FontWeight.w400,
+                          fontSize: 14,
+                          color: isSelectedDay ? Colors.blue : Colors.black,
+                        ),
+                      ),
+                      Text(
+                        DateFormat('d').format(date),
+                        style: TextStyle(
+                          fontWeight: FontWeight.w700,
+                          fontSize: 20,
+                          color: isSelectedDay
+                              ? ColorsManager.blue1
+                              : ColorsManager.blackColor,
+                        ),
+                      ),
+                    ],
                   );
                 },
                 timeLineBuilder: (date) {
-                  return TimeLineWidget(date: date);
+                  int hour = date.hour == 0
+                      ? 12
+                      : (date.hour > 12 ? date.hour - 12 : date.hour);
+                  String period = date.hour >= 12 ? 'PM' : 'AM';
+                  return Container(
+                    height: 60,
+                    alignment: Alignment.center,
+                    child: RichText(
+                      text: TextSpan(
+                        children: [
+                          TextSpan(
+                            text: '$hour',
+                            style: const TextStyle(
+                              fontWeight: FontWeight.w700,
+                              fontSize: 24,
+                              color: ColorsManager.blackColor,
+                            ),
+                          ),
+                          WidgetSpan(
+                            child: Padding(
+                              padding: const EdgeInsets.only(left: 2, top: 6),
+                              child: Text(
+                                period,
+                                style: const TextStyle(
+                                  fontWeight: FontWeight.w400,
+                                  fontSize: 12,
+                                  color: ColorsManager.blackColor,
+                                  letterSpacing: 1,
+                                ),
+                              ),
+                            ),
+                            alignment: PlaceholderAlignment.baseline,
+                            baseline: TextBaseline.alphabetic,
+                          ),
+                        ],
+                      ),
+                    ),
+                  );
                 },
                 timeLineWidth: timeLineWidth,
                 weekPageHeaderBuilder: (start, end) => Container(),
@@ -141,8 +174,49 @@ class WeeklyCalendarPage extends StatelessWidget {
                   ),
                 ),
                 eventTileBuilder: (date, events, boundary, start, end) {
-                  return EventTileWidget(
+                  return Container(
-                    events: events,
+                    margin:
+                        const EdgeInsets.symmetric(vertical: 2, horizontal: 2),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: events.map((event) {
+                        final bool isEventEnded = event.endTime != null &&
+                            event.endTime!.isBefore(DateTime.now());
+                        return Expanded(
+                          child: Container(
+                            width: double.infinity,
+                            padding: const EdgeInsets.all(6),
+                            decoration: BoxDecoration(
+                              color: isEventEnded
+                                  ? ColorsManager.lightGrayBorderColor
+                                  : ColorsManager.blue1.withOpacity(0.25),
+                              borderRadius: BorderRadius.circular(6),
+                            ),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Text(
+                                  DateFormat('h:mm a').format(event.startTime!),
+                                  style: const TextStyle(
+                                    fontWeight: FontWeight.bold,
+                                    fontSize: 12,
+                                    color: Colors.black87,
+                                  ),
+                                ),
+                                const SizedBox(height: 2),
+                                Text(
+                                  event.title,
+                                  style: const TextStyle(
+                                    fontSize: 12,
+                                    color: ColorsManager.blackColor,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        );
+                      }).toList(),
+                    ),
                   );
                 },
               ),

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

@@ -46,15 +46,15 @@ class DeviceManagementBloc
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi().fetchDevices('', '', projectUuid);
+        devices = await DevicesManagementApi().fetchDevices(
+          projectUuid,
+        );
       } else {
-        for (final community in spaceBloc.state.selectedCommunities) {
+        for (var community in spaceBloc.state.selectedCommunities) {
           final spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
-          for (final space in spacesList) {
           devices.addAll(await DevicesManagementApi()
-                .fetchDevices(community, space, projectUuid));
+              .fetchDevices(projectUuid, spacesId: spacesList));
-          }
         }
       }
 

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

@@ -170,7 +170,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-Future<void> _onLoadScenes(
+  Future<void> _onLoadScenes(
       LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
@@ -208,7 +208,7 @@ Future<void> _onLoadScenes(
           loadAutomationErrorMessage: '',
           scenes: scenes));
     }
-} 
+  }
 
   Future<void> _onLoadAutomation(
       LoadAutomation event, Emitter<RoutineState> emit) async {
@@ -936,16 +936,15 @@ Future<void> _onLoadScenes(
         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));
+              .fetchDevices(projectUuid, spacesId: spacesList));
-          }
         }
       } else {
         devices.addAll(await DevicesManagementApi().fetchDevices(
-            createRoutineBloc.selectedCommunityId,
+          projectUuid,
-            createRoutineBloc.selectedSpaceId,
+          spacesId: [createRoutineBloc.selectedSpaceId],
-            projectUuid));
+        ));
       }
 
       emit(state.copyWith(isLoading: false, devices: devices));

lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart

@@ -96,9 +96,7 @@ class _WallPresenceSensorState extends State<FlushPresenceSensor> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                DialogHeader(widget.dialogType == 'THEN'
+                const DialogHeader('Presence Sensor'),
-                    ? 'Presence Sensor Functions'
-                    : 'Presence Sensor Condition'),
                 Expanded(child: _buildMainContent(context, state)),
                 _buildDialogFooter(context, state),
               ],

lib/pages/space_management_v2/main_module/helpers/spaces_recursive_helper.dart

@@ -1,43 +0,0 @@
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-
-abstract final class SpacesRecursiveHelper {
-  static List<SpaceModel> recusrivelyUpdate(
-    List<SpaceModel> spaces,
-    SpaceDetailsModel updatedSpace,
-  ) {
-    return spaces.map((space) {
-      final isUpdatedSpace = space.uuid == updatedSpace.uuid;
-      if (isUpdatedSpace) {
-        return space.copyWith(
-          spaceName: updatedSpace.spaceName,
-          icon: updatedSpace.icon,
-        );
-      }
-      final hasChildren = space.children.isNotEmpty;
-      if (hasChildren) {
-        return space.copyWith(
-          children: recusrivelyUpdate(space.children, updatedSpace),
-        );
-      }
-      return space;
-    }).toList();
-  }
-
-  static List<SpaceModel> recusrivelyDelete(
-    List<SpaceModel> spaces,
-    String spaceUuid,
-  ) {
-    final updatedSpaces = spaces.map((space) {
-      if (space.uuid == spaceUuid) return null;
-      if (space.children.isNotEmpty) {
-        return space.copyWith(
-          children: recusrivelyDelete(space.children, spaceUuid),
-        );
-      }
-      return space;
-    }).toList();
-    final nonNullSpaces = updatedSpaces.whereType<SpaceModel>().toList();
-    return nonNullSpaces;
-  }
-}

lib/pages/space_management_v2/main_module/models/space_reorder_data_model.dart

@@ -1,14 +0,0 @@
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-
-class SpaceReorderDataModel {
-  const SpaceReorderDataModel({
-    required this.space,
-    this.parent,
-    this.community,
-  });
-
-  final SpaceModel space;
-  final SpaceModel? parent;
-  final CommunityModel? community;
-}

lib/pages/space_management_v2/main_module/painters/spaces_connections_arrow_painter.dart

@@ -5,14 +5,13 @@ import 'package:syncrow_web/utils/color_manager.dart';
 class SpacesConnectionsArrowPainter extends CustomPainter {
   final List<SpaceConnectionModel> connections;
   final Map<String, Offset> positions;
-  final Map<String, double> cardWidths;
+  final double cardWidth = 150.0;
   final double cardHeight = 90.0;
   final Set<String> highlightedUuids;
 
   SpacesConnectionsArrowPainter({
     required this.connections,
     required this.positions,
-    required this.cardWidths,
     required this.highlightedUuids,
   });
 
@@ -30,30 +29,19 @@ class SpacesConnectionsArrowPainter extends CustomPainter {
 
       final from = positions[connection.from];
       final to = positions[connection.to];
-      final fromWidth = cardWidths[connection.from] ?? 150.0;
-      final toWidth = cardWidths[connection.to] ?? 150.0;
 
       if (from != null && to != null) {
         final startPoint =
-            Offset(from.dx + fromWidth / 2, from.dy + cardHeight - 10);
+            Offset(from.dx + cardWidth / 2, from.dy + cardHeight - 10);
-        final endPoint = Offset(to.dx + toWidth / 2, to.dy);
+        final endPoint = Offset(to.dx + cardWidth / 2, to.dy);
 
         final path = Path()..moveTo(startPoint.dx, startPoint.dy);
 
-        if ((startPoint.dx - endPoint.dx).abs() < 1.0) {
+        final controlPoint1 = Offset(startPoint.dx, startPoint.dy + 20);
-          path.lineTo(endPoint.dx, endPoint.dy);
+        final controlPoint2 = Offset(endPoint.dx, endPoint.dy - 60);
-        } else {
+
-          final controlPoint1 = Offset(startPoint.dx, startPoint.dy + 100);
+        path.cubicTo(controlPoint1.dx, controlPoint1.dy, controlPoint2.dx,
-          final controlPoint2 = Offset(endPoint.dx, endPoint.dy - 100);
+            controlPoint2.dy, endPoint.dx, endPoint.dy);
-          path.cubicTo(
-            controlPoint1.dx,
-            controlPoint1.dy,
-            controlPoint2.dx,
-            controlPoint2.dy,
-            endPoint.dx,
-            endPoint.dy,
-          );
-        }
 
         canvas.drawPath(path, paint);
 
@@ -63,7 +51,7 @@ class SpacesConnectionsArrowPainter extends CustomPainter {
               : ColorsManager.blackColor.withValues(alpha: 0.5)
           ..style = PaintingStyle.fill
           ..blendMode = BlendMode.srcIn;
-        canvas.drawCircle(endPoint, 6, circlePaint);
+        canvas.drawCircle(endPoint, 4, circlePaint);
       }
     }
   }

lib/pages/space_management_v2/main_module/views/space_management_page.dart

@@ -10,46 +10,30 @@ import 'package:syncrow_web/pages/space_management_v2/modules/communities/presen
 import 'package:syncrow_web/pages/space_management_v2/modules/products/data/services/remote_products_service.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/presentation/bloc/products_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/remote_space_details_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/unique_space_details_spaces_decorator_service.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/unique_subspaces_decorator.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class SpaceManagementPage extends StatefulWidget {
+class SpaceManagementPage extends StatelessWidget {
   const SpaceManagementPage({super.key});
 
-  @override
-  State<SpaceManagementPage> createState() => _SpaceManagementPageState();
-}
-
-class _SpaceManagementPageState extends State<SpaceManagementPage> {
-  late final CommunitiesBloc communitiesBloc;
-
-  @override
-  void initState() {
-    communitiesBloc = CommunitiesBloc(
-      communitiesService: DebouncedCommunitiesService(
-        RemoteCommunitiesService(HTTPService()),
-      ),
-    )..add(const LoadCommunities(LoadCommunitiesParam()));
-
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) {
     return MultiBlocProvider(
       providers: [
-        BlocProvider.value(value: communitiesBloc),
         BlocProvider(
-          create: (context) => CommunitiesTreeSelectionBloc(
+          create: (context) => CommunitiesBloc(
-            communitiesBloc: communitiesBloc,
+            communitiesService: DebouncedCommunitiesService(
+              RemoteCommunitiesService(HTTPService()),
             ),
+          )..add(const LoadCommunities(LoadCommunitiesParam())),
         ),
+        BlocProvider(create: (context) => CommunitiesTreeSelectionBloc()),
         BlocProvider(
           create: (context) => SpaceDetailsBloc(
-            UniqueSpaceDetailsSpacesDecoratorService(
+            UniqueSubspacesDecorator(
               RemoteSpaceDetailsService(httpService: HTTPService()),
             ),
           ),

lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart

@@ -1,17 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/models/space_connection_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/models/space_reorder_data_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/painters/spaces_connections_arrow_painter.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/create_space_button.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_card_widget.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_cell.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CommunityStructureCanvas extends StatefulWidget {
   const CommunityStructureCanvas({
@@ -30,15 +26,13 @@ class CommunityStructureCanvas extends StatefulWidget {
 class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     with SingleTickerProviderStateMixin {
   final Map<String, Offset> _positions = {};
-  final Map<String, double> _cardWidths = {};
+  final double _cardWidth = 150.0;
   final double _cardHeight = 90.0;
   final double _horizontalSpacing = 150.0;
   final double _verticalSpacing = 120.0;
-  static const double _minCardWidth = 150.0;
 
-  late final TransformationController _transformationController;
+  late TransformationController _transformationController;
-  late final AnimationController _animationController;
+  late AnimationController _animationController;
-  SpaceReorderDataModel? _draggedData;
 
   @override
   void initState() {
@@ -53,7 +47,6 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
   @override
   void didUpdateWidget(covariant CommunityStructureCanvas oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (widget.selectedSpace == null) return;
     if (widget.selectedSpace?.uuid != oldWidget.selectedSpace?.uuid) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (mounted) {
@@ -70,34 +63,6 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     super.dispose();
   }
 
-  double _calculateCardWidth(String text) {
-    final style = context.textTheme.bodyLarge?.copyWith(
-      fontWeight: FontWeight.bold,
-    );
-    final textPainter = TextPainter(
-      text: TextSpan(text: text, style: style),
-      maxLines: 1,
-      textDirection: TextDirection.ltr,
-    )..layout();
-
-    const iconWidth = 40.0;
-    const horizontalPadding = 10.0;
-    const contentPadding = 10.0;
-    final calculatedWidth =
-        iconWidth + horizontalPadding + textPainter.width + contentPadding;
-
-    return calculatedWidth.clamp(_minCardWidth, double.infinity);
-  }
-
-  void _calculateAllCardWidths(List<SpaceModel> spaces) {
-    for (final space in spaces) {
-      _cardWidths[space.uuid] = _calculateCardWidth(space.spaceName);
-      if (space.children.isNotEmpty) {
-        _calculateAllCardWidths(space.children);
-      }
-    }
-  }
-
   Set<String> _getAllDescendantUuids(SpaceModel space) {
     final uuids = <String>{};
     for (final child in space.children) {
@@ -132,12 +97,11 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     final position = _positions[space.uuid];
     if (position == null) return;
 
-    final cardWidth = _cardWidths[space.uuid] ?? _minCardWidth;
+    const scale = 1.5;
-    const scale = 1;
     final viewSize = context.size;
     if (viewSize == null) return;
 
-    final x = -position.dx * scale + (viewSize.width / 2) - (cardWidth * scale / 2);
+    final x = -position.dx * scale + (viewSize.width / 2) - (_cardWidth * scale / 2);
     final y =
         -position.dy * scale + (viewSize.height / 2) - (_cardHeight * scale / 2);
 
@@ -148,33 +112,16 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     _runAnimation(matrix);
   }
 
-  void _onReorder(SpaceReorderDataModel data, int newIndex) {
-    final newCommunity = widget.community.copyWith();
-    final children = data.parent?.children ?? newCommunity.spaces;
-    final oldIndex = children.indexWhere((s) => s.uuid == data.space.uuid);
-    if (oldIndex != -1) {
-      final item = children.removeAt(oldIndex);
-      if (newIndex > oldIndex) {
-        children.insert(newIndex - 1, item);
-      } else {
-        children.insert(newIndex, item);
-      }
-    }
-    context.read<CommunitiesBloc>().add(
-          CommunitiesUpdateCommunity(newCommunity),
-        );
-  }
-
   void _onSpaceTapped(SpaceModel? space) {
     context.read<CommunitiesTreeSelectionBloc>().add(
           SelectSpaceEvent(community: widget.community, space: space),
         );
   }
 
-  void _resetSelectionAndZoom([CommunityModel? community]) {
+  void _resetSelectionAndZoom() {
     context.read<CommunitiesTreeSelectionBloc>().add(
           SelectSpaceEvent(
-            community: community ?? widget.community,
+            community: widget.community,
             space: null,
           ),
         );
@@ -186,16 +133,13 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     Map<int, double> levelXOffset,
   ) {
     for (final space in spaces) {
-      final cardWidth = _cardWidths[space.uuid] ?? _minCardWidth;
       double childSubtreeWidth = 0;
       if (space.children.isNotEmpty) {
         _calculateLayout(space.children, depth + 1, levelXOffset);
         final firstChildPos = _positions[space.children.first.uuid];
         final lastChildPos = _positions[space.children.last.uuid];
         if (firstChildPos != null && lastChildPos != null) {
-          final lastChildWidth =
+          childSubtreeWidth = (lastChildPos.dx + _cardWidth) - firstChildPos.dx;
-              _cardWidths[space.children.last.uuid] ?? _minCardWidth;
-          childSubtreeWidth = (lastChildPos.dx + lastChildWidth) - firstChildPos.dx;
         }
       }
 
@@ -204,7 +148,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
 
       if (space.children.isNotEmpty) {
         final firstChildPos = _positions[space.children.first.uuid]!;
-        x = firstChildPos.dx + (childSubtreeWidth - cardWidth) / 2;
+        x = firstChildPos.dx + (childSubtreeWidth - _cardWidth) / 2;
       } else {
         x = currentX;
       }
@@ -221,7 +165,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
 
       final y = depth * (_verticalSpacing + _cardHeight);
       _positions[space.uuid] = Offset(x, y);
-      levelXOffset[depth] = x + cardWidth + _horizontalSpacing;
+      levelXOffset[depth] = x + _cardWidth + _horizontalSpacing;
     }
   }
 
@@ -236,13 +180,9 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
 
   List<Widget> _buildTreeWidgets() {
     _positions.clear();
-    _cardWidths.clear();
     final community = widget.community;
 
-    _calculateAllCardWidths(community.spaces);
+    _calculateLayout(community.spaces, 0, {});
-
-    final levelXOffset = <int, double>{};
-    _calculateLayout(community.spaces, 0, levelXOffset);
 
     final selectedSpace = widget.selectedSpace;
     final highlightedUuids = <String>{};
@@ -253,31 +193,13 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
 
     final widgets = <Widget>[];
     final connections = <SpaceConnectionModel>[];
-    _generateWidgets(
+    _generateWidgets(community.spaces, widgets, connections, highlightedUuids);
-      widget.community.spaces,
-      widgets,
-      connections,
-      highlightedUuids,
-      community: widget.community,
-    );
-
-    final createButtonX = levelXOffset[0] ?? 0.0;
-    const createButtonY = 0.0;
-
-    widgets.add(
-      Positioned(
-        left: createButtonX,
-        top: createButtonY,
-        child: CreateSpaceButton(communityUuid: widget.community.uuid),
-      ),
-    );
 
     return [
       CustomPaint(
         painter: SpacesConnectionsArrowPainter(
           connections: connections,
           positions: _positions,
-          cardWidths: _cardWidths,
           highlightedUuids: highlightedUuids,
         ),
         child: Stack(alignment: AlignmentDirectional.center, children: widgets),
@@ -289,184 +211,67 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     List<SpaceModel> spaces,
     List<Widget> widgets,
     List<SpaceConnectionModel> connections,
-    Set<String> highlightedUuids, {
+    Set<String> highlightedUuids,
-    CommunityModel? community,
+  ) {
-    SpaceModel? parent,
+    for (final space in spaces) {
-  }) {
-    if (spaces.isNotEmpty) {
-      final firstChildPos = _positions[spaces.first.uuid]!;
-      final targetPos = Offset(
-        firstChildPos.dx - (_horizontalSpacing / 4),
-        firstChildPos.dy,
-      );
-      widgets.add(_buildDropTarget(parent, community, 0, targetPos));
-    }
-
-    for (var i = 0; i < spaces.length; i++) {
-      final space = spaces[i];
       final position = _positions[space.uuid];
-      if (position == null) {
+      if (position == null) continue;
-        continue;
-      }
 
-      final cardWidth = _cardWidths[space.uuid] ?? _minCardWidth;
       final isHighlighted = highlightedUuids.contains(space.uuid);
       final hasNoSelectedSpace = widget.selectedSpace == null;
 
-      final spaceCard = SpaceCardWidget(
-        buildSpaceContainer: () {
-          return Opacity(
-            opacity: hasNoSelectedSpace || isHighlighted ? 1.0 : 0.5,
-            child: SpaceCell(
-              onTap: () => _onSpaceTapped(space),
-              icon: space.icon,
-              name: space.spaceName,
-            ),
-          );
-        },
-        onTap: () => SpaceDetailsDialogHelper.showCreate(
-          context,
-          communityUuid: widget.community.uuid,
-        ),
-      );
-
-      final reorderData = SpaceReorderDataModel(
-        space: space,
-        parent: parent,
-        community: community,
-      );
-
       widgets.add(
         Positioned(
           left: position.dx,
           top: position.dy,
-          width: cardWidth,
+          width: _cardWidth,
           height: _cardHeight,
-          child: Draggable<SpaceReorderDataModel>(
+          child: SpaceCardWidget(
-            data: reorderData,
+            buildSpaceContainer: () {
-            feedback: Material(
+              return Opacity(
-              color: Colors.transparent,
+                opacity: hasNoSelectedSpace || isHighlighted ? 1.0 : 0.5,
-              child: Opacity(
+                child: Tooltip(
-                opacity: 0.2,
+                  message: space.spaceName,
-                child: SizedBox(
+                  preferBelow: false,
-                  width: cardWidth,
+                  child: SpaceCell(
-                  height: _cardHeight,
+                    onTap: () => _onSpaceTapped(space),
-                  child: spaceCard,
+                    icon: space.icon,
-                ),
+                    name: space.spaceName,
-              ),
-            ),
-            onDragStarted: () => setState(() => _draggedData = reorderData),
-            onDragEnd: (_) => setState(() => _draggedData = null),
-            onDraggableCanceled: (_, __) => setState(() => _draggedData = null),
-            childWhenDragging: Opacity(opacity: 0.4, child: spaceCard),
-            child: spaceCard,
                   ),
                 ),
               );
-
+            },
-      final targetPos = Offset(
+            onTap: () => SpaceDetailsDialogHelper.showCreate(context),
-        position.dx + cardWidth + (_horizontalSpacing / 4) - 20,
+          ),
-        position.dy,
+        ),
       );
-      widgets.add(_buildDropTarget(parent, community, i + 1, targetPos));
 
       for (final child in space.children) {
-        connections.add(SpaceConnectionModel(from: space.uuid, to: child.uuid));
+        connections.add(
-      }
+          SpaceConnectionModel(from: space.uuid, to: child.uuid),
-
-      if (space.children.isNotEmpty) {
-        _generateWidgets(
-          space.children,
-          widgets,
-          connections,
-          highlightedUuids,
-          parent: space,
         );
       }
+      _generateWidgets(space.children, widgets, connections, highlightedUuids);
     }
   }
 
-  Widget _buildDropTarget(
-    SpaceModel? parent,
-    CommunityModel? community,
-    int index,
-    Offset position,
-  ) {
-    return Positioned(
-      left: position.dx,
-      top: position.dy,
-      width: 40,
-      height: _cardHeight,
-      child: DragTarget<SpaceReorderDataModel>(
-        builder: (context, candidateData, rejectedData) {
-          if (_draggedData == null) {
-            return const SizedBox();
-          }
-
-          final isTargetForDragged = (_draggedData?.parent?.uuid == parent?.uuid &&
-                  _draggedData?.community == null) ||
-              (_draggedData?.community?.uuid == community?.uuid &&
-                  _draggedData?.parent == null);
-
-          if (!isTargetForDragged) {
-            return const SizedBox();
-          }
-
-          return Container(
-            width: 40,
-            height: _cardHeight,
-            decoration: BoxDecoration(
-              color: context.theme.colorScheme.primary.withValues(
-                alpha: candidateData.isNotEmpty ? 0.7 : 0.3,
-              ),
-              borderRadius: BorderRadius.circular(8),
-            ),
-            child: Icon(
-              Icons.add,
-              color: context.theme.colorScheme.onPrimary,
-            ),
-          );
-        },
-        onWillAcceptWithDetails: (data) {
-          final children = parent?.children ?? community?.spaces ?? [];
-          final isSameParent = (data.data.parent?.uuid == parent?.uuid &&
-                  data.data.community == null) ||
-              (data.data.community?.uuid == community?.uuid &&
-                  data.data.parent == null);
-
-          if (!isSameParent) {
-            return false;
-          }
-
-          final oldIndex =
-              children.indexWhere((s) => s.uuid == data.data.space.uuid);
-          if (oldIndex == index || oldIndex == index - 1) {
-            return false;
-          }
-          return true;
-        },
-        onAcceptWithDetails: (data) => _onReorder(data.data, index),
-      ),
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     final treeWidgets = _buildTreeWidgets();
-    return GestureDetector(
+    return InteractiveViewer(
-      onTap: _resetSelectionAndZoom,
-      child: InteractiveViewer(
       transformationController: _transformationController,
       boundaryMargin: EdgeInsets.symmetric(
-          horizontal: context.screenWidth * 0.3,
+        horizontal: MediaQuery.sizeOf(context).width * 0.3,
-          vertical: context.screenHeight * 0.3,
+        vertical: MediaQuery.sizeOf(context).height * 0.3,
       ),
       minScale: 0.5,
       maxScale: 3.0,
       constrained: false,
+      child: GestureDetector(
+        onTap: _resetSelectionAndZoom,
         child: SizedBox(
-          width: context.screenWidth * 5,
+          width: MediaQuery.sizeOf(context).width * 5,
-          height: context.screenHeight * 5,
+          height: MediaQuery.sizeOf(context).height * 5,
           child: Stack(children: treeWidgets),
         ),
       ),

lib/pages/space_management_v2/main_module/widgets/community_structure_header.dart

@@ -2,17 +2,18 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_header_action_buttons_composer.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_header_action_buttons.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CommunityStructureHeader extends StatelessWidget {
   const CommunityStructureHeader({super.key});
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
     final screenWidth = MediaQuery.of(context).size.width;
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0),
@@ -33,7 +34,7 @@ class CommunityStructureHeader extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Expanded(
-                child: _buildCommunityInfo(context, screenWidth),
+                child: _buildCommunityInfo(context, theme, screenWidth),
               ),
               const SizedBox(width: 16),
             ],
@@ -43,7 +44,8 @@ class CommunityStructureHeader extends StatelessWidget {
     );
   }
 
-  Widget _buildCommunityInfo(BuildContext context, double screenWidth) {
+  Widget _buildCommunityInfo(
+      BuildContext context, ThemeData theme, double screenWidth) {
     final selectedCommunity =
         context.watch<CommunitiesTreeSelectionBloc>().state.selectedCommunity;
     final selectedSpace =
@@ -53,9 +55,8 @@ class CommunityStructureHeader extends StatelessWidget {
       children: [
         Text(
           'Community Structure',
-          style: context.textTheme.headlineLarge?.copyWith(
+          style: theme.textTheme.headlineLarge
-            color: ColorsManager.blackColor,
+              ?.copyWith(color: ColorsManager.blackColor),
-          ),
         ),
         if (selectedCommunity != null)
           Row(
@@ -66,9 +67,8 @@ class CommunityStructureHeader extends StatelessWidget {
                     Flexible(
                       child: SelectableText(
                         selectedCommunity.name,
-                        style: context.textTheme.bodyLarge?.copyWith(
+                        style: theme.textTheme.bodyLarge
-                          color: ColorsManager.blackColor,
+                            ?.copyWith(color: ColorsManager.blackColor),
-                        ),
                         maxLines: 1,
                       ),
                     ),
@@ -90,8 +90,15 @@ class CommunityStructureHeader extends StatelessWidget {
                 ),
               ),
               const SizedBox(width: 8),
-              CommunityStructureHeaderActionButtonsComposer(
+              CommunityStructureHeaderActionButtons(
-                selectedCommunity: selectedCommunity,
+                onDelete: (space) {},
+                onDuplicate: (space) {},
+                onEdit: (space) {
+                  SpaceDetailsDialogHelper.showEdit(
+                    context,
+                    spaceModel: selectedSpace!,
+                  );
+                },
                 selectedSpace: selectedSpace,
               ),
             ],

lib/pages/space_management_v2/main_module/widgets/community_structure_header_action_buttons.dart

@@ -19,12 +19,11 @@ class CommunityStructureHeaderActionButtons extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (selectedSpace == null) return const SizedBox.shrink();
-
     return Wrap(
       alignment: WrapAlignment.end,
       spacing: 10,
       children: [
+        if (selectedSpace != null) ...[
           CommunityStructureHeaderButton(
             label: 'Edit',
             svgAsset: Assets.editSpace,
@@ -41,6 +40,7 @@ class CommunityStructureHeaderActionButtons extends StatelessWidget {
             onPressed: () => onDelete(selectedSpace!),
           ),
         ],
+      ],
     );
   }
 }

lib/pages/space_management_v2/main_module/widgets/community_structure_header_action_buttons_composer.dart

@@ -1,69 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/helpers/spaces_recursive_helper.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_header_action_buttons.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/presentation/widgets/delete_space_dialog.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
-
-class CommunityStructureHeaderActionButtonsComposer extends StatelessWidget {
-  const CommunityStructureHeaderActionButtonsComposer({
-    required this.selectedCommunity,
-    required this.selectedSpace,
-    super.key,
-  });
-  final CommunityModel selectedCommunity;
-  final SpaceModel? selectedSpace;
-
-  @override
-  Widget build(BuildContext context) {
-    return CommunityStructureHeaderActionButtons(
-      onDelete: (space) => showDialog<void>(
-        context: context,
-        barrierDismissible: false,
-        builder: (_) => DeleteSpaceDialog(
-          space: space,
-          community: selectedCommunity,
-          onSuccess: () {
-            final updatedSpaces = SpacesRecursiveHelper.recusrivelyDelete(
-              selectedCommunity.spaces,
-              space.uuid,
-            );
-            final community = selectedCommunity.copyWith(
-              spaces: updatedSpaces,
-            );
-            context.read<CommunitiesBloc>().add(
-                  CommunitiesUpdateCommunity(community),
-                );
-            context.read<CommunitiesTreeSelectionBloc>().add(
-                  SelectCommunityEvent(community: selectedCommunity),
-                );
-          },
-        ),
-      ),
-      onDuplicate: (space) {},
-      onEdit: (space) => SpaceDetailsDialogHelper.showEdit(
-        context,
-        spaceModel: selectedSpace!,
-        communityUuid: selectedCommunity.uuid,
-        onSuccess: (updatedSpaceDetails) {
-          final communitiesBloc = context.read<CommunitiesBloc>();
-          final updatedSpaces = SpacesRecursiveHelper.recusrivelyUpdate(
-            selectedCommunity.spaces,
-            updatedSpaceDetails,
-          );
-
-          final community = selectedCommunity.copyWith(
-            spaces: updatedSpaces,
-          );
-
-          communitiesBloc.add(CommunitiesUpdateCommunity(community));
-        },
-      ),
-      selectedSpace: selectedSpace,
-    );
-  }
-}

lib/pages/space_management_v2/main_module/widgets/create_space_button.dart

@@ -2,70 +2,42 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
-class CreateSpaceButton extends StatefulWidget {
+class CreateSpaceButton extends StatelessWidget {
-  const CreateSpaceButton({
+  const CreateSpaceButton({super.key});
-    required this.communityUuid,
-    super.key,
-  });
-
-  final String communityUuid;
-
-  @override
-  State<CreateSpaceButton> createState() => _CreateSpaceButtonState();
-}
-
-class _CreateSpaceButtonState extends State<CreateSpaceButton> {
-  bool _isHovered = false;
 
   @override
   Widget build(BuildContext context) {
-    return Tooltip(
+    return GestureDetector(
-      margin: const EdgeInsets.symmetric(vertical: 24),
+      onTap: () => SpaceDetailsDialogHelper.showCreate(context),
-      message: 'Create a new space',
-      child: InkWell(
-        onTap: () => SpaceDetailsDialogHelper.showCreate(
-          context,
-          communityUuid: widget.communityUuid,
-        ),
-        child: MouseRegion(
-          onEnter: (_) => setState(() => _isHovered = true),
-          onExit: (_) => setState(() => _isHovered = false),
-          child: AnimatedOpacity(
-            duration: const Duration(milliseconds: 100),
-            opacity: _isHovered ? 1.0 : 0.45,
       child: Container(
-              width: 150,
+        height: 60,
-              height: 90,
         decoration: BoxDecoration(
           color: Colors.white,
           borderRadius: BorderRadius.circular(20),
           boxShadow: [
             BoxShadow(
-                    color: Colors.grey.withValues(alpha: 0.2),
+              color: Colors.grey.withValues(alpha: 0.5),
-                    spreadRadius: 3,
+              spreadRadius: 5,
-                    blurRadius: 8,
+              blurRadius: 7,
-                    offset: const Offset(0, 4),
+              offset: const Offset(0, 3),
             ),
           ],
         ),
+        child: Center(
           child: Container(
-                margin: const EdgeInsets.symmetric(vertical: 20),
+            width: 40,
-                decoration: BoxDecoration(
+            height: 40,
-                  border: Border.all(color: ColorsManager.borderColor, width: 2),
+            decoration: const BoxDecoration(
               color: ColorsManager.boxColor,
               shape: BoxShape.circle,
             ),
-                child: const Center(
+            child: const Icon(
-                  child: Icon(
               Icons.add,
               color: Colors.blue,
             ),
           ),
         ),
       ),
-          ),
-        ),
-      ),
     );
   }
 }

lib/pages/space_management_v2/main_module/widgets/plus_button_widget.dart

@@ -2,23 +2,32 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class PlusButtonWidget extends StatelessWidget {
-  final void Function() onTap;
+  final Offset offset;
+  final void Function() onButtonTap;
 
   const PlusButtonWidget({
-    required this.onTap,
     super.key,
+    required this.offset,
+    required this.onButtonTap,
   });
 
   @override
   Widget build(BuildContext context) {
-    return IconButton.filled(
+    return GestureDetector(
-      onPressed: onTap,
+      onTap: onButtonTap,
-      style: IconButton.styleFrom(backgroundColor: ColorsManager.spaceColor),
+      child: Container(
-      icon: const Icon(
+        width: 30,
+        height: 30,
+        decoration: const BoxDecoration(
+          color: ColorsManager.spaceColor,
+          shape: BoxShape.circle,
+        ),
+        child: const Icon(
           Icons.add,
           color: ColorsManager.whiteColors,
           size: 20,
         ),
+      ),
     );
   }
 }

lib/pages/space_management_v2/main_module/widgets/space_card_widget.dart

@@ -22,6 +22,7 @@ class _SpaceCardWidgetState extends State<SpaceCardWidget> {
     return MouseRegion(
       onEnter: (_) => setState(() => isHovered = true),
       onExit: (_) => setState(() => isHovered = false),
+      child: SizedBox(
         child: Stack(
           clipBehavior: Clip.none,
           alignment: Alignment.center,
@@ -29,13 +30,15 @@ class _SpaceCardWidgetState extends State<SpaceCardWidget> {
             widget.buildSpaceContainer(),
             if (isHovered)
               Positioned(
-              bottom: -5,
+                bottom: 0,
                 child: PlusButtonWidget(
-                onTap: widget.onTap,
+                  offset: Offset.zero,
+                  onButtonTap: widget.onTap,
                 ),
               ),
           ],
         ),
+      ),
     );
   }
 }

lib/pages/space_management_v2/main_module/widgets/space_cell.dart

@@ -17,23 +17,25 @@ class SpaceCell extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return InkWell(
+    return GestureDetector(
       onTap: onTap,
       child: Container(
-        padding: const EdgeInsetsDirectional.only(end: 10),
+        width: 150,
         height: 70,
         decoration: _containerDecoration(),
         child: Row(
-          spacing: 10,
-          mainAxisSize: MainAxisSize.min,
           children: [
             _buildIconContainer(),
-            Text(
+            const SizedBox(width: 10),
+            Expanded(
+              child: Text(
                 name,
                 style: context.textTheme.bodyLarge?.copyWith(
                   fontWeight: FontWeight.bold,
                   color: ColorsManager.blackColor,
                 ),
+                overflow: TextOverflow.ellipsis,
+              ),
             ),
           ],
         ),

lib/pages/space_management_v2/main_module/widgets/space_management_community_structure.dart

@@ -3,8 +3,6 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_header.dart';
 import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/create_space_button.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
 
 class SpaceManagementCommunityStructure extends StatelessWidget {
@@ -15,44 +13,22 @@ class SpaceManagementCommunityStructure extends StatelessWidget {
     final selectionBloc = context.watch<CommunitiesTreeSelectionBloc>().state;
     final selectedCommunity = selectionBloc.selectedCommunity;
     final selectedSpace = selectionBloc.selectedSpace;
-    return Column(
+    const spacer = Spacer(flex: 10);
+    return Visibility(
+      visible: selectedCommunity!.spaces.isNotEmpty,
+      replacement: const Row(
+        children: [spacer, Expanded(child: CreateSpaceButton()), spacer],
+      ),
+      child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
           const CommunityStructureHeader(),
-        Visibility(
+          Expanded(
-          visible: selectedCommunity!.spaces.isNotEmpty,
-          replacement: _buildEmptyWidget(selectedCommunity),
-          child: _buildCanvas(selectedCommunity, selectedSpace),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildCanvas(
-    CommunityModel selectedCommunity,
-    SpaceModel? selectedSpace,
-  ) {
-    return Expanded(
             child: CommunityStructureCanvas(
               community: selectedCommunity,
               selectedSpace: selectedSpace,
             ),
-    );
-  }
-
-  Widget _buildEmptyWidget(CommunityModel selectedCommunity) {
-    const spacer = Spacer(flex: 6);
-
-    return Expanded(
-      child: Row(
-        children: [
-          spacer,
-          Expanded(
-            child: CreateSpaceButton(
-              communityUuid: selectedCommunity.uuid,
           ),
-          ),
-          spacer,
         ],
       ),
     );

lib/pages/space_management_v2/modules/communities/domain/models/space_model.dart

@@ -46,25 +46,6 @@ class SpaceModel extends Equatable {
     );
   }
 
-  SpaceModel copyWith({
-    String? uuid,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    String? spaceName,
-    String? icon,
-    List<SpaceModel>? children,
-  }) {
-    return SpaceModel(
-      uuid: uuid ?? this.uuid,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      spaceName: spaceName ?? this.spaceName,
-      icon: icon ?? this.icon,
-      children: children ?? this.children,
-      parent: parent,
-    );
-  }
-
   @override
   List<Object?> get props => [uuid, spaceName, icon, children];
 }

lib/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart

@@ -1,39 +1,17 @@
-import 'dart:async';
-
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
 
 part 'communities_tree_selection_event.dart';
 part 'communities_tree_selection_state.dart';
 
 class CommunitiesTreeSelectionBloc
     extends Bloc<CommunitiesTreeSelectionEvent, CommunitiesTreeSelectionState> {
-  CommunitiesTreeSelectionBloc({
+  CommunitiesTreeSelectionBloc() : super(const CommunitiesTreeSelectionState()) {
-    required CommunitiesBloc communitiesBloc,
-  })  : _communitiesBloc = communitiesBloc,
-        super(const CommunitiesTreeSelectionState()) {
     on<SelectCommunityEvent>(_onSelectCommunity);
     on<SelectSpaceEvent>(_onSelectSpace);
     on<ClearCommunitiesTreeSelectionEvent>(_onClearSelection);
-    on<_CommunitiesStateUpdated>(_onCommunitiesStateUpdated);
-
-    _communitiesSubscription = _communitiesBloc.stream.listen((communitiesState) {
-      if (state.selectedCommunity != null) {
-        add(_CommunitiesStateUpdated(communitiesState));
-      }
-    });
-  }
-
-  final CommunitiesBloc _communitiesBloc;
-  late final StreamSubscription<CommunitiesState> _communitiesSubscription;
-
-  @override
-  Future<void> close() {
-    _communitiesSubscription.cancel();
-    return super.close();
   }
 
   void _onSelectCommunity(
@@ -66,59 +44,4 @@ class CommunitiesTreeSelectionBloc
   ) {
     emit(const CommunitiesTreeSelectionState());
   }
-
-  void _onCommunitiesStateUpdated(
-    _CommunitiesStateUpdated event,
-    Emitter<CommunitiesTreeSelectionState> emit,
-  ) {
-    if (state.selectedCommunity == null) return;
-
-    final communities = event.communitiesState.communities;
-    try {
-      final updatedCommunity = communities.firstWhere(
-        (c) => c.uuid == state.selectedCommunity!.uuid,
-      );
-
-      var updatedSelectedSpace = state.selectedSpace;
-      if (state.selectedSpace != null) {
-        updatedSelectedSpace = _findSpaceInCommunity(
-          updatedCommunity,
-          state.selectedSpace!.uuid,
-        );
-      }
-      emit(
-        state.copyWith(
-          selectedCommunity: updatedCommunity,
-          selectedSpace: updatedSelectedSpace,
-          clearSelectedSpace: updatedSelectedSpace == null,
-        ),
-      );
-    } catch (_) {
-      add(const ClearCommunitiesTreeSelectionEvent());
-    }
-  }
-
-  SpaceModel? _findSpaceInCommunity(CommunityModel community, String spaceUuid) {
-    try {
-      return _findSpaceRecursive(community.spaces, spaceUuid);
-    } catch (_) {
-      return null;
-    }
-  }
-
-  SpaceModel _findSpaceRecursive(List<SpaceModel> spaces, String spaceUuid) {
-    for (final space in spaces) {
-      if (space.uuid == spaceUuid) {
-        return space;
-      }
-      if (space.children.isNotEmpty) {
-        try {
-          return _findSpaceRecursive(space.children, spaceUuid);
-        } catch (_) {
-          // not found in this branch
-        }
-      }
-    }
-    throw Exception('Space not found');
-  }
 }

lib/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_event.dart

@@ -29,12 +29,3 @@ final class ClearCommunitiesTreeSelectionEvent
     extends CommunitiesTreeSelectionEvent {
   const ClearCommunitiesTreeSelectionEvent();
 }
-
-final class _CommunitiesStateUpdated extends CommunitiesTreeSelectionEvent {
-  const _CommunitiesStateUpdated(this.communitiesState);
-
-  final CommunitiesState communitiesState;
-
-  @override
-  List<Object> get props => [communitiesState];
-}

lib/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_state.dart

@@ -12,14 +12,18 @@ final class CommunitiesTreeSelectionState extends Equatable {
   CommunitiesTreeSelectionState copyWith({
     CommunityModel? selectedCommunity,
     SpaceModel? selectedSpace,
-    bool clearSelectedSpace = false,
+    List<CommunityModel>? expandedCommunities,
+    List<SpaceModel>? expandedSpaces,
   }) {
     return CommunitiesTreeSelectionState(
       selectedCommunity: selectedCommunity ?? this.selectedCommunity,
-      selectedSpace: clearSelectedSpace ? null : selectedSpace ?? this.selectedSpace,
+      selectedSpace: selectedSpace ?? this.selectedSpace,
     );
   }
 
   @override
-  List<Object?> get props => [selectedCommunity, selectedSpace];
+  List<Object?> get props => [
-}
+        selectedCommunity,
+        selectedSpace,
+      ];
+  }

lib/pages/space_management_v2/modules/communities/presentation/widgets/communities_tree_failure_widget.dart

@@ -13,14 +13,14 @@ class CommunitiesTreeFailureWidget extends StatelessWidget {
     return Expanded(
       child: Center(
         child: Column(
-          spacing: 16,
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            SelectableText(
+            Text(
               errorMessage ?? 'Something went wrong',
               textAlign: TextAlign.center,
             ),
-            FilledButton(
+            const SizedBox(height: 16),
+            ElevatedButton(
               onPressed: () => context.read<CommunitiesBloc>().add(
                     LoadCommunities(
                       LoadCommunitiesParam(

lib/pages/space_management_v2/modules/delete_space/data/remote_delete_space_service.dart

@@ -1,64 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/domain/params/delete_space_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/domain/services/delete_space_service.dart';
-import 'package:syncrow_web/services/api/api_exception.dart';
-import 'package:syncrow_web/services/api/http_service.dart';
-import 'package:syncrow_web/utils/constants/api_const.dart';
-
-final class RemoteDeleteSpaceService implements DeleteSpaceService {
-  const RemoteDeleteSpaceService(this._httpService);
-
-  final HTTPService _httpService;
-
-  @override
-  Future<void> delete(DeleteSpaceParam param) async {
-    try {
-      await _httpService.delete(
-        path: await _makeUrl(param),
-        expectedResponseModel: (json) {
-          final response = json as Map<String, dynamic>;
-          final hasSuccessfullyDeletedSpace = response['success'] as bool? ?? false;
-
-          if (!hasSuccessfullyDeletedSpace) {
-            throw APIException('Failed to delete space');
-          }
-
-          return hasSuccessfullyDeletedSpace;
-        },
-      );
-    } on DioException catch (e) {
-      final message = e.response?.data as Map<String, dynamic>?;
-      throw APIException(_getErrorMessageFromBody(message));
-    } catch (e) {
-      throw APIException(e.toString());
-    }
-  }
-
-  String _getErrorMessageFromBody(Map<String, dynamic>? body) {
-    if (body == null) return 'Failed to delete space';
-    final error = body['error'] as Map<String, dynamic>?;
-    final errorMessage = error?['message'] as String? ?? '';
-    return errorMessage;
-  }
-
-  Future<String> _makeUrl(DeleteSpaceParam param) async {
-    final projectUuid = await ProjectManager.getProjectUUID();
-    if (projectUuid == null) {
-      throw APIException('Project UUID is not set');
-    }
-
-    if (param.communityUuid.isEmpty) {
-      throw APIException('Community UUID is not set');
-    }
-
-    if (param.spaceUuid.isEmpty) {
-      throw APIException('Space UUID is not set');
-    }
-
-    return ApiEndpoints.deleteSpace
-        .replaceAll('{projectId}', projectUuid)
-        .replaceAll('{communityId}', param.communityUuid)
-        .replaceAll('{spaceId}', param.spaceUuid);
-  }
-}

lib/pages/space_management_v2/modules/delete_space/domain/params/delete_space_param.dart

@@ -1,9 +0,0 @@
-class DeleteSpaceParam {
-  const DeleteSpaceParam({
-    required this.spaceUuid,
-    required this.communityUuid,
-  });
-
-  final String spaceUuid;
-  final String communityUuid;
-}

lib/pages/space_management_v2/modules/delete_space/domain/services/delete_space_service.dart

@@ -1,5 +0,0 @@
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/domain/params/delete_space_param.dart';
-
-abstract interface class DeleteSpaceService {
-  Future<void> delete(DeleteSpaceParam param);
-}

lib/pages/space_management_v2/modules/delete_space/presentation/bloc/delete_space_bloc.dart

@@ -1,31 +0,0 @@
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/domain/params/delete_space_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/domain/services/delete_space_service.dart';
-import 'package:syncrow_web/services/api/api_exception.dart';
-
-part 'delete_space_event.dart';
-part 'delete_space_state.dart';
-
-class DeleteSpaceBloc extends Bloc<DeleteSpaceEvent, DeleteSpaceState> {
-  DeleteSpaceBloc(this._deleteSpaceService) : super(DeleteSpaceInitial()) {
-    on<DeleteSpace>(_onDeleteSpace);
-  }
-
-  final DeleteSpaceService _deleteSpaceService;
-
-  Future<void> _onDeleteSpace(
-    DeleteSpace event,
-    Emitter<DeleteSpaceState> emit,
-  ) async {
-    emit(DeleteSpaceLoading());
-    try {
-      await _deleteSpaceService.delete(event.param);
-      emit(const DeleteSpaceSuccess('Space deleted successfully'));
-    } on APIException catch (e) {
-      emit(DeleteSpaceFailure(e.message));
-    } catch (e) {
-      emit(DeleteSpaceFailure(e.toString()));
-    }
-  }
-}

lib/pages/space_management_v2/modules/delete_space/presentation/bloc/delete_space_event.dart

@@ -1,17 +0,0 @@
-part of 'delete_space_bloc.dart';
-
-sealed class DeleteSpaceEvent extends Equatable {
-  const DeleteSpaceEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-final class DeleteSpace extends DeleteSpaceEvent {
-  const DeleteSpace(this.param);
-
-  final DeleteSpaceParam param;
-
-  @override
-  List<Object> get props => [param];
-}

lib/pages/space_management_v2/modules/delete_space/presentation/bloc/delete_space_state.dart

@@ -1,30 +0,0 @@
-part of 'delete_space_bloc.dart';
-
-sealed class DeleteSpaceState extends Equatable {
-  const DeleteSpaceState();
-
-  @override
-  List<Object> get props => [];
-}
-
-final class DeleteSpaceInitial extends DeleteSpaceState {}
-
-final class DeleteSpaceLoading extends DeleteSpaceState {}
-
-final class DeleteSpaceSuccess extends DeleteSpaceState {
-  const DeleteSpaceSuccess(this.successMessage);
-
-  final String successMessage;
-
-  @override
-  List<Object> get props => [successMessage];
-}
-
-final class DeleteSpaceFailure extends DeleteSpaceState {
-  const DeleteSpaceFailure(this.errorMessage);
-
-  final String errorMessage;
-
-  @override
-  List<Object> get props => [errorMessage];
-}

lib/pages/space_management_v2/modules/delete_space/presentation/widgets/delete_space_dialog.dart

@@ -1,73 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/data/remote_delete_space_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/presentation/bloc/delete_space_bloc.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/presentation/widgets/delete_space_dialog_form.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/presentation/widgets/delete_space_loading_widget.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/presentation/widgets/delete_space_status_widget.dart';
-import 'package:syncrow_web/services/api/http_service.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class DeleteSpaceDialog extends StatelessWidget {
-  const DeleteSpaceDialog({
-    required this.space,
-    required this.community,
-    required this.onSuccess,
-    super.key,
-  });
-
-  final SpaceModel space;
-  final CommunityModel community;
-  final void Function() onSuccess;
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => DeleteSpaceBloc(
-        RemoteDeleteSpaceService(HTTPService()),
-      ),
-      child: Builder(
-        builder: (context) => Dialog(
-          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
-          child: Container(
-            padding: const EdgeInsetsDirectional.all(32),
-            constraints: BoxConstraints(
-              maxWidth: context.screenWidth * 0.2,
-            ),
-            child: BlocConsumer<DeleteSpaceBloc, DeleteSpaceState>(
-              listener: (context, state) {
-                if (state case DeleteSpaceSuccess()) onSuccess();
-              },
-              builder: (context, state) => switch (state) {
-                DeleteSpaceInitial() => DeleteSpaceDialogForm(
-                    space: space,
-                    communityUuid: community.uuid,
-                  ),
-                DeleteSpaceLoading() => const DeleteSpaceLoadingWidget(),
-                DeleteSpaceSuccess() => DeleteSpaceStatusWidget(
-                    message: state.successMessage,
-                    icon: const Icon(
-                      Icons.check_circle,
-                      size: 92,
-                      color: ColorsManager.goodGreen,
-                    ),
-                  ),
-                DeleteSpaceFailure() => DeleteSpaceStatusWidget(
-                    message: state.errorMessage,
-                    icon: const Icon(
-                      Icons.error,
-                      size: 92,
-                      color: ColorsManager.red,
-                    ),
-                  ),
-              },
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/space_management_v2/modules/delete_space/presentation/widgets/delete_space_dialog_form.dart

@@ -1,106 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/domain/params/delete_space_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/delete_space/presentation/bloc/delete_space_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class DeleteSpaceDialogForm extends StatelessWidget {
-  const DeleteSpaceDialogForm({
-    required this.space,
-    required this.communityUuid,
-    super.key,
-  });
-
-  final SpaceModel space;
-  final String communityUuid;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        SvgPicture.asset(Assets.xDelete, width: 36, height: 36),
-        const SizedBox(height: 16),
-        SelectableText(
-          'Delete Space',
-          textAlign: TextAlign.center,
-          style: context.textTheme.titleLarge?.copyWith(
-            color: ColorsManager.blackColor,
-            fontWeight: FontWeight.w400,
-            fontSize: 24,
-          ),
-        ),
-        const SizedBox(height: 8),
-        SelectableText(
-          'Are you sure you want to delete this space? This action is irreversible',
-          textAlign: TextAlign.center,
-          style: context.textTheme.bodyLarge?.copyWith(
-            color: ColorsManager.lightGreyColor,
-            fontWeight: FontWeight.w400,
-            fontSize: 14,
-          ),
-        ),
-        const SizedBox(height: 24),
-        Row(
-          children: [
-            Expanded(
-              child: FilledButton(
-                style: _buildButtonStyle(
-                  context,
-                  color: ColorsManager.grey25,
-                  textColor: ColorsManager.blackColor,
-                ),
-                onPressed: Navigator.of(context).pop,
-                child: const Text('Cancel'),
-              ),
-            ),
-            const SizedBox(width: 16),
-            Expanded(
-              child: FilledButton(
-                style: _buildButtonStyle(
-                  context,
-                  color: ColorsManager.semiTransparentRed,
-                  textColor: ColorsManager.whiteColors,
-                ),
-                onPressed: () {
-                  context.read<DeleteSpaceBloc>().add(
-                        DeleteSpace(
-                          DeleteSpaceParam(
-                            spaceUuid: space.uuid,
-                            communityUuid: communityUuid,
-                          ),
-                        ),
-                      );
-                },
-                child: const Text('Delete'),
-              ),
-            ),
-          ],
-        ),
-      ],
-    );
-  }
-
-  ButtonStyle _buildButtonStyle(
-    BuildContext context, {
-    required Color color,
-    required Color textColor,
-  }) {
-    return FilledButton.styleFrom(
-      padding: const EdgeInsets.symmetric(vertical: 12),
-      backgroundColor: color,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(8),
-      ),
-      foregroundColor: textColor,
-      textStyle: context.textTheme.bodyLarge?.copyWith(
-        fontWeight: FontWeight.w400,
-        fontSize: 14,
-      ),
-    );
-  }
-}

lib/pages/space_management_v2/modules/delete_space/presentation/widgets/delete_space_loading_widget.dart

@@ -1,13 +0,0 @@
-import 'package:flutter/material.dart';
-
-class DeleteSpaceLoadingWidget extends StatelessWidget {
-  const DeleteSpaceLoadingWidget({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return const SizedBox.square(
-      dimension: 32,
-      child: Center(child: CircularProgressIndicator()),
-    );
-  }
-}

lib/pages/space_management_v2/modules/delete_space/presentation/widgets/delete_space_status_widget.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class DeleteSpaceStatusWidget extends StatelessWidget {
-  const DeleteSpaceStatusWidget({
-    required this.message,
-    required this.icon,
-    super.key,
-  });
-
-  final String message;
-  final Widget icon;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      spacing: 16,
-      children: [
-        icon,
-        SelectableText(
-          message,
-          style: context.textTheme.bodyMedium?.copyWith(
-            color: ColorsManager.blackColor,
-            fontSize: 22,
-          ),
-          textAlign: TextAlign.center,
-        ),
-        FilledButton(
-          onPressed: Navigator.of(context).pop,
-          child: const Text('Close'),
-        ),
-      ],
-    );
-  }
-}

lib/pages/space_management_v2/modules/space_details/data/services/unique_subspaces_decorator.dart

@@ -2,27 +2,23 @@ import 'package:syncrow_web/pages/space_management_v2/modules/space_details/doma
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/services/space_details_service.dart';
 
-class UniqueSpaceDetailsSpacesDecoratorService implements SpaceDetailsService {
+class UniqueSubspacesDecorator implements SpaceDetailsService {
   final SpaceDetailsService _decoratee;
 
-  const UniqueSpaceDetailsSpacesDecoratorService(this._decoratee);
+  const UniqueSubspacesDecorator(this._decoratee);
 
   @override
   Future<SpaceDetailsModel> getSpaceDetails(LoadSpaceDetailsParam param) async {
     final response = await _decoratee.getSpaceDetails(param);
 
     final uniqueSubspaces = <String, Subspace>{};
-    final duplicateNames = <String>{};
 
     for (final subspace in response.subspaces) {
       final normalizedName = subspace.name.trim().toLowerCase();
-      if (uniqueSubspaces.containsKey(normalizedName)) {
+      if (!uniqueSubspaces.containsKey(normalizedName)) {
-        duplicateNames.add(normalizedName);
-      } else {
         uniqueSubspaces[normalizedName] = subspace;
       }
     }
-    duplicateNames.forEach(uniqueSubspaces.remove);
 
     return response.copyWith(
       subspaces: uniqueSubspaces.values.toList(),

lib/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart

@@ -40,6 +40,16 @@ class SpaceDetailsModel extends Equatable {
     );
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'spaceName': spaceName,
+      'icon': icon,
+      'productAllocations': productAllocations.map((e) => e.toJson()).toList(),
+      'subspaces': subspaces.map((e) => e.toJson()).toList(),
+    };
+  }
+
   SpaceDetailsModel copyWith({
     String? uuid,
     String? spaceName,
@@ -79,6 +89,14 @@ class ProductAllocation extends Equatable {
     );
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'product': product.toJson(),
+      'tag': tag.toJson(),
+    };
+  }
+
   ProductAllocation copyWith({
     String? uuid,
     Product? product,
@@ -116,6 +134,14 @@ class Subspace extends Equatable {
     );
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'name': name,
+      'productAllocations': productAllocations.map((e) => e.toJson()).toList(),
+    };
+  }
+
   Subspace copyWith({
     String? uuid,
     String? name,

lib/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart

@@ -2,37 +2,23 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/data/services/remote_space_details_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_dialog.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/data/services/remote_update_space_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/domain/params/update_space_param.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/presentation/bloc/update_space_bloc.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 
 abstract final class SpaceDetailsDialogHelper {
-  static void showCreate(
+  static void showCreate(BuildContext context) {
-    BuildContext context, {
-    required String communityUuid,
-  }) {
     showDialog<void>(
       context: context,
-      builder: (_) => MultiBlocProvider(
+      builder: (_) => BlocProvider(
-        providers: [
-          BlocProvider(
         create: (context) => SpaceDetailsBloc(
           RemoteSpaceDetailsService(httpService: HTTPService()),
         ),
-          ),
+        child: SpaceDetailsDialog(
-        ],
-        child: Builder(
-          builder: (context) => SpaceDetailsDialog(
           context: context,
           title: const SelectableText('Create Space'),
           spaceModel: SpaceModel.empty(),
           onSave: (space) {},
-            communityUuid: communityUuid,
-          ),
         ),
       ),
     );
@@ -41,98 +27,20 @@ abstract final class SpaceDetailsDialogHelper {
   static void showEdit(
     BuildContext context, {
     required SpaceModel spaceModel,
-    required String communityUuid,
-    required void Function(SpaceDetailsModel updatedSpaceDetails)? onSuccess,
   }) {
     showDialog<void>(
       context: context,
-      builder: (_) => MultiBlocProvider(
+      builder: (_) => BlocProvider(
-        providers: [
-          BlocProvider(
         create: (context) => SpaceDetailsBloc(
           RemoteSpaceDetailsService(httpService: HTTPService()),
         ),
-          ),
-          BlocProvider(
-            create: (context) => UpdateSpaceBloc(
-              RemoteUpdateSpaceService(HTTPService()),
-            ),
-          ),
-        ],
-        child: Builder(
-          builder: (context) => BlocListener<UpdateSpaceBloc, UpdateSpaceState>(
-            listener: (context, state) => _updateListener(
-              context,
-              state,
-              onSuccess,
-            ),
         child: SpaceDetailsDialog(
           context: context,
           title: const SelectableText('Edit Space'),
           spaceModel: spaceModel,
-              onSave: (space) => context.read<UpdateSpaceBloc>().add(
+          onSave: (space) {},
-                    UpdateSpace(
-                      UpdateSpaceParam(
-                        communityUuid: communityUuid,
-                        space: space,
         ),
       ),
-                  ),
-              communityUuid: communityUuid,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  static void _updateListener(
-    BuildContext context,
-    UpdateSpaceState state,
-    void Function(SpaceDetailsModel updatedSpaceDetails)? onSuccess,
-  ) {
-    return switch (state) {
-      UpdateSpaceInitial() => null,
-      UpdateSpaceLoading() => _onLoading(context),
-      UpdateSpaceSuccess(:final space) =>
-        _onUpdateSuccess(context, space, onSuccess),
-      UpdateSpaceFailure(:final errorMessage) => _onError(context, errorMessage),
-    };
-  }
-
-  static void _onUpdateSuccess(
-    BuildContext context,
-    SpaceDetailsModel space,
-    void Function(SpaceDetailsModel updatedSpaceDetails)? onSuccess,
-  ) {
-    Navigator.of(context).pop();
-    Navigator.of(context).pop();
-    onSuccess?.call(space);
-  }
-
-  static void _onLoading(BuildContext context) {
-    showDialog<void>(
-      context: context,
-      barrierDismissible: false,
-      builder: (_) => const Center(child: CircularProgressIndicator()),
-    );
-  }
-
-  static void _onError(BuildContext context, String errorMessage) {
-    Navigator.of(context).pop();
-    showDialog<void>(
-      context: context,
-      barrierDismissible: false,
-      builder: (_) => AlertDialog(
-        title: const Text('Error'),
-        content: Text(errorMessage),
-        actions: [
-          TextButton(
-            onPressed: Navigator.of(context).pop,
-            child: const Text('OK'),
-          ),
-        ],
-      ),
     );
   }
 }

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_details_dialog.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/bloc/space_details_bloc.dart';
@@ -14,7 +15,6 @@ class SpaceDetailsDialog extends StatefulWidget {
     required this.spaceModel,
     required this.onSave,
     required this.context,
-    required this.communityUuid,
     super.key,
   });
 
@@ -22,7 +22,6 @@ class SpaceDetailsDialog extends StatefulWidget {
   final SpaceModel spaceModel;
   final void Function(SpaceDetailsModel space) onSave;
   final BuildContext context;
-  final String communityUuid;
 
   @override
   State<SpaceDetailsDialog> createState() => _SpaceDetailsDialogState();
@@ -36,7 +35,11 @@ class _SpaceDetailsDialogState extends State<SpaceDetailsDialog> {
     if (!isCreateMode) {
       final param = LoadSpaceDetailsParam(
         spaceUuid: widget.spaceModel.uuid,
-        communityUuid: widget.communityUuid,
+        communityUuid: widget.context
+            .read<CommunitiesTreeSelectionBloc>()
+            .state
+            .selectedCommunity!
+            .uuid,
       );
       widget.context.read<SpaceDetailsBloc>().add(LoadSpaceDetails(param));
     }

lib/pages/space_management_v2/modules/space_details/presentation/widgets/space_sub_spaces_dialog.dart

@@ -37,7 +37,7 @@ class _SpaceSubSpacesDialogState extends State<SpaceSubSpacesDialog> {
         ..._subspaces,
         Subspace(
           name: name,
-          uuid: '${const Uuid().v4()}-NewTag',
+          uuid: const Uuid().v4(),
           productAllocations: const [],
         ),
       ];

lib/pages/space_management_v2/modules/tags/domain/models/tag.dart

@@ -3,19 +3,41 @@ import 'package:equatable/equatable.dart';
 class Tag extends Equatable {
   final String uuid;
   final String name;
+  final String createdAt;
+  final String updatedAt;
 
   const Tag({
     required this.uuid,
     required this.name,
+    required this.createdAt,
+    required this.updatedAt,
   });
 
+  factory Tag.empty() => const Tag(
+        uuid: '',
+        name: '',
+        createdAt: '',
+        updatedAt: '',
+      );
+
   factory Tag.fromJson(Map<String, dynamic> json) {
     return Tag(
       uuid: json['uuid'] as String,
       name: json['name'] as String,
+      createdAt: json['createdAt'] as String,
+      updatedAt: json['updatedAt'] as String,
     );
   }
 
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'name': name,
+      'createdAt': createdAt,
+      'updatedAt': updatedAt,
+    };
+  }
+
   @override
-  List<Object?> get props => [uuid, name];
+  List<Object?> get props => [uuid, name, createdAt, updatedAt];
 }

lib/pages/space_management_v2/modules/tags/presentation/widgets/add_device_type_widget.dart

@@ -10,12 +10,7 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class AddDeviceTypeWidget extends StatefulWidget {
-  const AddDeviceTypeWidget({
+  const AddDeviceTypeWidget({super.key});
-    super.key,
-    this.initialProducts = const [],
-  });
-
-  final List<Product> initialProducts;
 
   @override
   State<AddDeviceTypeWidget> createState() => _AddDeviceTypeWidgetState();
@@ -23,16 +18,6 @@ class AddDeviceTypeWidget extends StatefulWidget {
 
 class _AddDeviceTypeWidgetState extends State<AddDeviceTypeWidget> {
   final Map<Product, int> _selectedProducts = {};
-  final Map<Product, int> _initialProductCounts = {};
-
-  @override
-  void initState() {
-    super.initState();
-    for (final product in widget.initialProducts) {
-      _initialProductCounts[product] = (_initialProductCounts[product] ?? 0) + 1;
-    }
-    _selectedProducts.addAll(_initialProductCounts);
-  }
 
   void _onIncrement(Product product) {
     setState(() {
@@ -42,12 +27,8 @@ class _AddDeviceTypeWidgetState extends State<AddDeviceTypeWidget> {
 
   void _onDecrement(Product product) {
     setState(() {
-      final initialCount = _initialProductCounts[product] ?? 0;
+      if ((_selectedProducts[product] ?? 0) > 0) {
-      final currentCount = _selectedProducts[product] ?? 0;
+        _selectedProducts[product] = _selectedProducts[product]! - 1;
-      if (currentCount > initialCount) {
-        _selectedProducts[product] = currentCount - 1;
-      } else if (currentCount > 0 && initialCount == 0) {
-        _selectedProducts[product] = currentCount - 1;
         if (_selectedProducts[product] == 0) {
           _selectedProducts.remove(product);
         }
@@ -82,22 +63,7 @@ class _AddDeviceTypeWidgetState extends State<AddDeviceTypeWidget> {
           actions: [
             SpaceDetailsActionButtons(
               onSave: () {
-                final resultMap = <Product, int>{};
+                final result = _selectedProducts.entries
-                resultMap.addAll(_selectedProducts);
-
-                for (final entry in _initialProductCounts.entries) {
-                  final product = entry.key;
-                  final initialCount = entry.value;
-                  final currentCount = resultMap[product] ?? 0;
-
-                  if (currentCount > initialCount) {
-                    resultMap[product] = currentCount - initialCount;
-                  } else {
-                    resultMap.remove(product);
-                  }
-                }
-
-                final result = resultMap.entries
                     .expand((entry) => List.generate(entry.value, (_) => entry.key))
                     .toList();
                 Navigator.of(context).pop(result);

lib/pages/space_management_v2/modules/tags/presentation/widgets/assign_tags_dialog.dart

@@ -205,14 +205,7 @@ class _AssignTagsDialogState extends State<AssignTagsDialog> {
           onCancel: () async {
             final newProducts = await showDialog<List<Product>>(
               context: context,
-              builder: (context) => AddDeviceTypeWidget(
+              builder: (context) => const AddDeviceTypeWidget(),
-                initialProducts: [
-                  ..._space.productAllocations.map((e) => e.product),
-                  ..._space.subspaces
-                      .expand((s) => s.productAllocations)
-                      .map((e) => e.product),
-                ],
-              ),
             );
 
             if (newProducts == null || newProducts.isEmpty) return;
@@ -221,12 +214,9 @@ class _AssignTagsDialogState extends State<AssignTagsDialog> {
               for (final product in newProducts) {
                 _space.productAllocations.add(
                   ProductAllocation(
-                    uuid: '${const Uuid().v4()}-NewProductUuid',
+                    uuid: const Uuid().v4(),
                     product: product,
-                    tag: Tag(
+                    tag: Tag.empty(),
-                      uuid: '${const Uuid().v4()}-NewTag',
-                      name: '',
-                    ),
                   ),
                 );
               }

lib/pages/space_management_v2/modules/tags/presentation/widgets/product_tag_field.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/tags/domain/models/tag.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:uuid/uuid.dart';
 
 class ProductTagField extends StatefulWidget {
   final List<Tag> items;
@@ -54,8 +53,13 @@ class _ProductTagFieldState extends State<ProductTagField> {
   void _submit(String value) {
     final lowerCaseValue = value.toLowerCase();
     final selectedTag = widget.items.firstWhere(
-      (e) => e.name.toLowerCase() == lowerCaseValue,
+      (tag) => tag.name.toLowerCase() == lowerCaseValue,
-      orElse: () => Tag(uuid: '${const Uuid().v4()}-NewTag', name: value),
+      orElse: () => Tag(
+        name: value,
+        uuid: '',
+        createdAt: '',
+        updatedAt: '',
+      ),
     );
     widget.onSelected(selectedTag);
     _closeDropdown();

lib/pages/space_management_v2/modules/update_space/data/services/remote_update_space_service.dart

@@ -1,7 +1,5 @@
 import 'package:dio/dio.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/domain/params/update_space_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/update_space/domain/services/update_space_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
@@ -14,23 +12,17 @@ class RemoteUpdateSpaceService implements UpdateSpaceService {
   static const _defaultErrorMessage = 'Failed to update space';
 
   @override
-  Future<SpaceDetailsModel> updateSpace(UpdateSpaceParam param) async {
+  Future<SpaceDetailsModel> updateSpace(SpaceDetailsModel space) async {
     try {
-      final path = await _makeUrl(param);
+      final response = await _httpService.put(
-      await _httpService.put(
+        path: 'endpoint',
-        path: path,
+        body: space.toJson(),
-        body: param.toJson(),
+        expectedResponseModel: (data) => SpaceDetailsModel.fromJson(
-        expectedResponseModel: (data) {
+          data as Map<String, dynamic>,
-          final response = data as Map<String, dynamic>;
+        ),
-          final isSuccess = response['success'] as bool;
-          if (!isSuccess) {
-            throw APIException(response['error'] as String);
-          }
-          return isSuccess;
-        },
       );
 
-      return param.space;
+      return response;
     } on DioException catch (e) {
       final message = e.response?.data as Map<String, dynamic>?;
       final error = message?['error'] as Map<String, dynamic>?;
@@ -45,23 +37,4 @@ class RemoteUpdateSpaceService implements UpdateSpaceService {
       throw APIException(formattedErrorMessage);
     }
   }
-
-  Future<String> _makeUrl(UpdateSpaceParam param) async {
-    final projectUuid = await ProjectManager.getProjectUUID();
-    if (projectUuid == null || projectUuid.isEmpty) {
-      throw APIException('Project UUID is not set');
-    }
-
-    final spaceUuid = param.space.uuid;
-    if (spaceUuid.isEmpty) {
-      throw APIException('Space UUID is not set');
-    }
-
-    final communityUuid = param.communityUuid;
-    if (communityUuid.isEmpty) {
-      throw APIException('Community UUID is not set');
-    }
-
-    return '/projects/$projectUuid/communities/$communityUuid/spaces/$spaceUuid';
-  }
 }

lib/pages/space_management_v2/modules/update_space/domain/params/update_space_param.dart

@@ -1,42 +0,0 @@
-import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-
-class UpdateSpaceParam {
-  UpdateSpaceParam({
-    required this.space,
-    required this.communityUuid,
-  });
-
-  final SpaceDetailsModel space;
-  final String communityUuid;
-
-  Map<String, dynamic> toJson() {
-    return {
-      'spaceName': space.spaceName,
-      'icon': space.icon,
-      'subspaces': space.subspaces.map((e) => e._toJson()).toList(),
-      'productAllocations':
-          space.productAllocations.map((e) => e._toJson()).toList(),
-    };
-  }
-}
-
-extension _ProductAllocationToJson on ProductAllocation {
-  Map<String, dynamic> _toJson() {
-    final isNewTag = tag.uuid.isEmpty;
-    return <String, dynamic>{
-      if (isNewTag) 'tagName': tag.name else 'tagUuid': tag.uuid,
-      'productUuid': product.uuid,
-    };
-  }
-}
-
-extension _SubspaceToJson on Subspace {
-  Map<String, dynamic> _toJson() {
-    final isNewSubspace = uuid.endsWith('-NewTag');
-    return <String, dynamic>{
-      if (!isNewSubspace) 'uuid': uuid,
-      'subspaceName': name,
-      'productAllocations': productAllocations.map((e) => e._toJson()).toList(),
-    };
-  }
-}

lib/pages/space_management_v2/modules/update_space/domain/services/update_space_service.dart

@@ -1,6 +1,5 @@
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/domain/params/update_space_param.dart';
 
-abstract interface class UpdateSpaceService {
+abstract class UpdateSpaceService {
-  Future<SpaceDetailsModel> updateSpace(UpdateSpaceParam param);
+  Future<SpaceDetailsModel> updateSpace(SpaceDetailsModel space);
 }

lib/pages/space_management_v2/modules/update_space/presentation/bloc/update_space_bloc.dart

@@ -1,7 +1,6 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/models/space_details_model.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_space/domain/params/update_space_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/update_space/domain/services/update_space_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 
@@ -21,7 +20,7 @@ class UpdateSpaceBloc extends Bloc<UpdateSpaceEvent, UpdateSpaceState> {
   ) async {
     emit(UpdateSpaceLoading());
     try {
-      final updatedSpace = await _updateSpaceService.updateSpace(event.param);
+      final updatedSpace = await _updateSpaceService.updateSpace(event.space);
       emit(UpdateSpaceSuccess(updatedSpace));
     } on APIException catch (e) {
       emit(UpdateSpaceFailure(e.message));

lib/pages/space_management_v2/modules/update_space/presentation/bloc/update_space_event.dart

@@ -8,10 +8,10 @@ sealed class UpdateSpaceEvent extends Equatable {
 }
 
 final class UpdateSpace extends UpdateSpaceEvent {
-  const UpdateSpace(this.param);
+  const UpdateSpace(this.space);
 
-  final UpdateSpaceParam param;
+  final SpaceDetailsModel space;
 
   @override
-  List<Object> get props => [param];
+  List<Object> get props => [space];
 }

lib/pages/space_management_v2/modules/update_space/presentation/bloc/update_space_state.dart

@@ -21,10 +21,10 @@ final class UpdateSpaceSuccess extends UpdateSpaceState {
 }
 
 final class UpdateSpaceFailure extends UpdateSpaceState {
-  final String errorMessage;
+  final String message;
 
-  const UpdateSpaceFailure(this.errorMessage);
+  const UpdateSpaceFailure(this.message);
 
   @override
-  List<Object> get props => [errorMessage];
+  List<Object> get props => [message];
 }

lib/services/devices_mang_api.dart

@@ -12,20 +12,16 @@ import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class DevicesManagementApi {
-  Future<List<AllDevicesModel>> fetchDevices(
+  Future<List<AllDevicesModel>> fetchDevices(String projectId,
-      String communityId, String spaceId, String projectId) async {
+      {List<String>? spacesId}) async {
     try {
       final response = await HTTPService().get(
-        path: communityId.isNotEmpty && spaceId.isNotEmpty
+        path: ApiEndpoints.getSpaceDevices.replaceAll('{projectId}', projectId),
-            ? ApiEndpoints.getSpaceDevices
+        queryParameters: {if (spacesId != null) 'spaces': spacesId},
-                .replaceAll('{spaceUuid}', spaceId)
-                .replaceAll('{communityUuid}', communityId)
-                .replaceAll('{projectId}', projectId)
-            : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = json['data'];
+          final List<dynamic> jsonData = json['data'] as List<dynamic>;
-          List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
+          final List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();
           return devicesList;
@@ -416,5 +412,4 @@ class DevicesManagementApi {
     );
     return response;
   }
-
 }

lib/utils/color_manager.dart

@@ -69,6 +69,7 @@ abstract class ColorsManager {
   static const Color invitedOrange = Color(0xFFFFE193);
   static const Color invitedOrangeText = Color(0xFFFFBF00);
   static const Color lightGrayBorderColor = Color(0xB2D5D5D5);
+  //background: #F8F8F8;
   static const Color vividBlue = Color(0xFF023DFE);
   static const Color semiTransparentRed = Color(0x99FF0000);
   static const Color grey700 = Color(0xFF2D3748);
@@ -84,5 +85,4 @@ abstract class ColorsManager {
   static const Color minBlueDot = Color(0xFF023DFE);
   static const Color grey25 = Color(0xFFF9F9F9);
   static const Color grey50 = Color(0xFF718096);
-  static const Color grey800 = Color(0xffF8F8F8);
 }

lib/utils/constants/api_const.dart

@@ -17,8 +17,7 @@ abstract class ApiEndpoints {
   ////// Devices Management ////////////////
 
   static const String getAllDevices = '/projects/{projectId}/devices';
-  static const String getSpaceDevices =
+  static const String getSpaceDevices = '/projects/{projectId}/devices';
-      '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices';
   static const String getDeviceStatus = '/devices/{uuid}/functions/status';
   static const String getBatchStatus = '/devices/batch';
 
@@ -141,5 +140,4 @@ abstract class ApiEndpoints {
   static const String saveSchedule = '/schedule/{deviceUuid}';
 
   static const String getBookableSpaces = '/bookable-spaces';
-  static const String getCalendarEvents = '/api';
 }

lib/utils/constants/assets.dart

@@ -517,5 +517,4 @@ class Assets {
   static const String emptyRangeOfAqi = 'assets/icons/empty_range_of_aqi.svg';
   static const String homeIcon = 'assets/icons/home_icon.svg';
   static const String groupIcon = 'assets/icons/group_icon.svg';
-  static const String xDelete = 'assets/icons/x_delete.svg';
 }