Setup new firebase project in the web platform.

<!--
  Thanks for contributing!

Provide a description of your changes below and a general summary in the
title

Please look at the following checklist to ensure that your PR can be
accepted quickly:
-->

## Jira Ticket


## Description

hot fix thermostat as requested by Talal

## Type of Change

<!--- Put an `x` in all the boxes that apply: -->

- [ ] ✨ New feature (non-breaking change which adds functionality)
- [x] 🛠️ Bug fix (non-breaking change which fixes an issue)
- [ ] ❌ Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] 🧹 Code refactor
- [ ] ✅ Build configuration change
- [ ] 📝 Documentation
- [ ] 🗑️ Chore

assets/icons/group_icon.svg

@@ -1,15 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_9717_7433)">
-<path d="M17.1131 10.6766H15.5664C15.7241 11.1083 15.8102 11.5741 15.8102 12.0596V17.9053C15.8102 18.1077 15.775 18.302 15.7109 18.4827H18.2679C19.2231 18.4827 20.0002 17.7056 20.0002 16.7505V13.5637C20.0002 11.9718 18.7051 10.6766 17.1131 10.6766Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M4.19005 12.0596C4.19005 11.5741 4.27618 11.1083 4.43384 10.6766H2.88712C1.29516 10.6766 0 11.9718 0 13.5637V16.7505C0 17.7057 0.777072 18.4828 1.73227 18.4828H4.28938C4.22528 18.302 4.19005 18.1077 4.19005 17.9053V12.0596Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M11.7679 9.17249H8.23184C6.63989 9.17249 5.34473 10.4676 5.34473 12.0596V17.9053C5.34473 18.2242 5.60324 18.4827 5.92215 18.4827H14.0776C14.3965 18.4827 14.655 18.2242 14.655 17.9053V12.0596C14.655 10.4676 13.3598 9.17249 11.7679 9.17249Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M9.99995 1.51721C8.08541 1.51721 6.52783 3.07479 6.52783 4.98937C6.52783 6.288 7.24459 7.42218 8.30311 8.01765C8.80518 8.30008 9.38401 8.46148 9.99995 8.46148C10.6159 8.46148 11.1947 8.30008 11.6968 8.01765C12.7553 7.42218 13.4721 6.28796 13.4721 4.98937C13.4721 3.07483 11.9145 1.51721 9.99995 1.51721Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M3.90284 4.75354C2.471 4.75354 1.30615 5.91839 1.30615 7.35022C1.30615 8.78206 2.471 9.94691 3.90284 9.94691C4.26604 9.94691 4.6119 9.87168 4.92608 9.73644C5.46929 9.50257 5.91718 9.08859 6.19433 8.57003C6.38886 8.20609 6.49952 7.79089 6.49952 7.35022C6.49952 5.91843 5.33468 4.75354 3.90284 4.75354Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M16.0972 4.75354C14.6653 4.75354 13.5005 5.91839 13.5005 7.35022C13.5005 7.79093 13.6112 8.20612 13.8057 8.57003C14.0828 9.08863 14.5307 9.50261 15.0739 9.73644C15.3881 9.87168 15.734 9.94691 16.0972 9.94691C17.529 9.94691 18.6939 8.78206 18.6939 7.35022C18.6939 5.91839 17.529 4.75354 16.0972 4.75354Z" fill="#023DFE" fill-opacity="0.7"/>
-</g>
-<defs>
-<clipPath id="clip0_9717_7433">
-<rect width="20" height="20" fill="white"/>
-</clipPath>
-</defs>
-</svg>

assets/icons/home_icon.svg

@@ -1,4 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.0002 5.97498L3.12109 11.2683V18.3601H8.64871V13.163H11.5852V18.3601H16.8794V11.2683L10.0002 5.97498Z" fill="#023DFE" fill-opacity="0.7"/>
-<path d="M17.1673 7.15356V3.52759H14.2702V4.92485L10 1.63989L0 9.33274L1.38043 11.1271L10 4.49458L18.6196 11.1272L20 9.33278L17.1673 7.15356Z" fill="#023DFE" fill-opacity="0.7"/>
-</svg>

lib/pages/access_management/bloc/access_bloc.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/model/password_model.dart';
+import 'package:syncrow_web/pages/access_management/model/password_model.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/hour_picker_dialog.dart';
 import 'package:syncrow_web/services/access_mang_api.dart';

lib/pages/access_management/bloc/access_state.dart

@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/model/password_model.dart';
+import 'package:syncrow_web/pages/access_management/model/password_model.dart';
 
 abstract class AccessState extends Equatable {
   const AccessState();

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

@@ -1,52 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/load_bookable_spaces_param.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/paginated_bookable_spaces.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/services/bookable_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 RemoteBookableSpacesService implements BookableSystemService {
-  const RemoteBookableSpacesService(this._httpService);
-
-  final HTTPService _httpService;
-  static const _defaultErrorMessage = 'Failed to load bookable spaces';
-
-  @override
-  Future<PaginatedBookableSpaces> getBookableSpaces({
-    required LoadBookableSpacesParam param,
-  }) async {
-    try {
-      final response = await _httpService.get(
-        path: ApiEndpoints.getBookableSpaces,
-        queryParameters: {
-          'page': param.page,
-          'size': param.size,
-          'active': true,
-          'configured': true,
-          if (param.search != null &&
-              param.search.isNotEmpty &&
-              param.search != 'null')
-            'search': param.search,
-        },
-        expectedResponseModel: (json) {
-          return PaginatedBookableSpaces.fromJson(
-            json as Map<String, dynamic>,
-          );
-        },
-      );
-      return response;
-    } 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/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/load_bookable_spaces_param.dart

@@ -1,36 +0,0 @@
-import 'package:equatable/equatable.dart';
-
-class LoadBookableSpacesParam extends Equatable {
-  const LoadBookableSpacesParam({
-    this.page = 1,
-    this.size = 25,
-    this.search = '',
-    this.active = true,
-    this.configured = true,
-  });
-
-  final int page;
-  final int size;
-  final String search;
-  final bool active;
-  final bool configured;
-
-  LoadBookableSpacesParam copyWith({
-    int? page,
-    int? size,
-    String? search,
-    bool? active,
-    bool? configured,
-  }) {
-    return LoadBookableSpacesParam(
-      page: page ?? this.page,
-      size: size ?? this.size,
-      search: search ?? this.search,
-      active: active ?? this.active,
-      configured: configured ?? this.configured,
-    );
-  }
-
-  @override
-  List<Object?> get props => [page, size, search, active, configured];
-}

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

@@ -1,52 +0,0 @@
-class BookableSpaceModel {
-  final String uuid;
-  final String spaceName;
-  final String virtualLocation;
-  final BookableConfig bookableConfig;
-
-  BookableSpaceModel({
-    required this.uuid,
-    required this.spaceName,
-    required this.virtualLocation,
-    required this.bookableConfig,
-  });
-
-  factory BookableSpaceModel.fromJson(Map<String, dynamic> json) {
-    return BookableSpaceModel(
-      uuid: json['uuid'] as String,
-      spaceName: json['spaceName'] as String,
-      virtualLocation: json['virtualLocation'] as String,
-      bookableConfig: BookableConfig.fromJson(
-          json['bookableConfig'] as Map<String, dynamic>),
-    );
-  }
-}
-
-class BookableConfig {
-  final String uuid;
-  final List<String> daysAvailable;
-  final String startTime;
-  final String endTime;
-  final bool active;
-  final int points;
-
-  BookableConfig({
-    required this.uuid,
-    required this.daysAvailable,
-    required this.startTime,
-    required this.endTime,
-    required this.active,
-    required this.points,
-  });
-
-  factory BookableConfig.fromJson(Map<String, dynamic> json) {
-    return BookableConfig(
-      uuid: json['uuid'] as String,
-      daysAvailable: (json['daysAvailable'] as List).cast<String>(),
-      startTime: json['startTime'] as String,
-      endTime: json['endTime'] as String,
-      active: json['active'] as bool,
-      points: json['points'] as int,
-    );
-  }
-}

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/models/paginated_bookable_spaces.dart

@@ -1,40 +0,0 @@
-
-
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/bookable_room.dart';
-
-class PaginatedBookableSpaces {
-  final List<BookableSpaceModel> data;
-  final String message;
-  final int page;
-  final int size;
-  final int totalItem;
-  final int totalPage;
-  final bool hasNext;
-  final bool hasPrevious;
-
-  PaginatedBookableSpaces({
-    required this.data,
-    required this.message,
-    required this.page,
-    required this.size,
-    required this.totalItem,
-    required this.totalPage,
-    required this.hasNext,
-    required this.hasPrevious,
-  });
-
-  factory PaginatedBookableSpaces.fromJson(Map<String, dynamic> json) {
-    return PaginatedBookableSpaces(
-      data: (json['data'] as List)
-          .map((item) => BookableSpaceModel.fromJson(item))
-          .toList(),
-      message: json['message'] as String,
-      page: json['page'] as int,
-      size: json['size'] as int,
-      totalItem: json['totalItem'] as int,
-      totalPage: json['totalPage'] as int,
-      hasNext: json['hasNext'] as bool,
-      hasPrevious: json['hasPrevious'] as bool,
-    );
-  }
-}

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

@@ -1,8 +0,0 @@
-import 'package:syncrow_web/pages/access_management/booking_system/domain/load_bookable_spaces_param.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/paginated_bookable_spaces.dart';
-
-abstract class BookableSystemService {
-  Future<PaginatedBookableSpaces> getBookableSpaces({
-    required LoadBookableSpacesParam param,
-  });
-}

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/domain/services/debounced_bookable_spaces_service.dart

@@ -1,45 +0,0 @@
-import 'dart:async';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/load_bookable_spaces_param.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/paginated_bookable_spaces.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/services/bookable_system_service.dart';
-
-class DebouncedBookableSpacesService implements BookableSystemService {
-  final BookableSystemService _inner;
-  final Duration debounceDuration;
-
-  Timer? _debounceTimer;
-  Completer<PaginatedBookableSpaces>? _lastCompleter;
-
-  DebouncedBookableSpacesService(
-    this._inner, {
-    this.debounceDuration = const Duration(milliseconds: 500),
-  });
-
-  @override
-  Future<PaginatedBookableSpaces> getBookableSpaces({
-    required LoadBookableSpacesParam param,
-  }) {
-    _debounceTimer?.cancel();
-    if (_lastCompleter != null && !_lastCompleter!.isCompleted) {
-      _lastCompleter!.completeError(StateError("Cancelled by new search"));
-    }
-
-    final completer = Completer<PaginatedBookableSpaces>();
-    _lastCompleter = completer;
-
-    _debounceTimer = Timer(debounceDuration, () async {
-      try {
-        final result = await _inner.getBookableSpaces(param: param);
-        if (!completer.isCompleted) {
-          completer.complete(result);
-        }
-      } catch (e, st) {
-        if (!completer.isCompleted) {
-          completer.completeError(e, st);
-        }
-      }
-    });
-
-    return completer.future;
-  }
-}

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

@@ -1,115 +0,0 @@
-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()) {
-    on<LoadEvents>(_onLoadEvents);
-    on<AddEvent>(_onAddEvent);
-    on<StartTimer>(_onStartTimer);
-    on<DisposeResources>(_onDisposeResources);
-    on<GoToWeek>(_onGoToWeek);
-  }
-
-  Future<void> _onLoadEvents(
-    LoadEvents event,
-    Emitter<CalendarEventState> emit,
-  ) async {
-    emit(EventsLoading());
-    try {
-      final response = await calendarService.getCalendarEvents(
-        spaceId: event.spaceId,
-      );
-      final events =
-          response.data.map<CalendarEventData>(_toCalendarEventData).toList();
-      eventController.addAll(events);
-      emit(EventsLoaded(events: events));
-    } catch (e) {
-      emit(EventsError('Failed to load 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],
-      ));
-    }
-  }
-
-  void _onStartTimer(StartTimer event, Emitter<CalendarEventState> emit) {}
-
-  void _onDisposeResources(
-      DisposeResources event, Emitter<CalendarEventState> emit) {
-    eventController.dispose();
-  }
-
-  void _onGoToWeek(GoToWeek event, Emitter<CalendarEventState> emit) {
-    if (state is EventsLoaded) {
-      final loaded = state as EventsLoaded;
-      final newWeekDays = _getWeekDays(event.weekDate);
-      emit(EventsLoaded(
-        events: loaded.events,
-      ));
-    }
-  }
-
-  CalendarEventData _toCalendarEventData(CalendarEventBooking booking) {
-    final date = booking.date;
-
-    final localDate = date.toLocal();
-
-    final startParts = booking.startTime.split(':').map(int.parse).toList();
-    final endParts = booking.endTime.split(':').map(int.parse).toList();
-
-    final startTime = DateTime(
-      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, 
-    );
-  }
-
-  List<DateTime> _getWeekDays(DateTime date) {
-    final int weekday = date.weekday;
-    final DateTime monday = date.subtract(Duration(days: weekday - 1));
-    return List.generate(7, (i) => monday.add(Duration(days: i)));
-  }
-
-  @override
-  Future<void> close() {
-    eventController.dispose();
-    return super.close();
-  }
-}

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

@@ -1,37 +0,0 @@
-part of 'events_bloc.dart';
-
-@immutable
-abstract class CalendarEventsEvent {
-  const CalendarEventsEvent();
-}
-
-class LoadEvents extends CalendarEventsEvent {
-  final String spaceId;
-  final DateTime weekStart;
-  final DateTime weekEnd;
-
-  const LoadEvents({
-    required this.spaceId,
-    required this.weekStart,
-    required this.weekEnd,
-  });
-}
-
-class AddEvent extends CalendarEventsEvent {
-  final CalendarEventData event;
-  const AddEvent(this.event);
-}
-
-class StartTimer extends CalendarEventsEvent {}
-
-class DisposeResources extends CalendarEventsEvent {}
-
-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

@@ -1,21 +0,0 @@
-part of 'events_bloc.dart';
-
-@immutable
-abstract class CalendarEventState {}
-
-class EventsInitial extends CalendarEventState {}
-
-class EventsLoading extends CalendarEventState {}
-
-class EventsLoaded extends CalendarEventState {
-  final List<CalendarEventData> events;
-
-  EventsLoaded({
-    required this.events,
-  });
-}
-
-class EventsError extends CalendarEventState {
-  final String message;
-  EventsError(this.message);
-}

lib/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_bloc.dart

@@ -1,40 +0,0 @@
-import 'package:bloc/bloc.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_event.dart';
-import 'date_selection_state.dart';
-
-
-class DateSelectionBloc extends Bloc<DateSelectionEvent, DateSelectionState> {
-  DateSelectionBloc() : super(DateSelectionState.initial()) {
-    on<SelectDate>((event, emit) {
-      final newWeekStart = _getStartOfWeek(event.selectedDate);
-      emit(state.copyWith(
-        selectedDate: event.selectedDate,
-        weekStart: newWeekStart,
-      ));
-    });
-
-    on<NextWeek>((event, emit) {
-      final newWeekStart = state.weekStart.add(const Duration(days: 7));
-      emit(state.copyWith(
-        weekStart: newWeekStart,
-      ));
-    });
-
-    on<PreviousWeek>((event, emit) {
-      final newWeekStart = state.weekStart.subtract(const Duration(days: 7));
-      emit(state.copyWith(
-        weekStart: newWeekStart,
-      ));
-    });
-
-    on<SelectDateFromSidebarCalendar>((event, emit) {
-      emit(state.copyWith(
-        selectedDateFromSideBarCalender: event.selectedDate,
-      ));
-    });
-  }
-
-  static DateTime _getStartOfWeek(DateTime date) {
-    return date.subtract(Duration(days: date.weekday - 1));
-  }
-}

lib/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_event.dart

@@ -1,18 +0,0 @@
-
-abstract class DateSelectionEvent {
-  const DateSelectionEvent();
-}
-
-class SelectDate extends DateSelectionEvent {
-  final DateTime selectedDate;
-  const SelectDate(this.selectedDate);
-}
-
-class NextWeek extends DateSelectionEvent {}
-
-class PreviousWeek extends DateSelectionEvent {}
-
-class SelectDateFromSidebarCalendar extends DateSelectionEvent {
-  final DateTime selectedDate;
-  SelectDateFromSidebarCalendar(this.selectedDate);
-}

lib/pages/access_management/booking_system/presentation/bloc/date_selection/date_selection_state.dart

@@ -1,34 +0,0 @@
-
-class DateSelectionState {
-  final DateTime selectedDate;
-  final DateTime weekStart;
-  final DateTime? selectedDateFromSideBarCalender;
-
-  DateSelectionState({
-    required this.selectedDate,
-    required this.weekStart,
-    this.selectedDateFromSideBarCalender,
-  });
-
-  factory DateSelectionState.initial() {
-    final now = DateTime.now();
-    final weekStart = now.subtract(Duration(days: now.weekday - 1));
-    return DateSelectionState(
-      selectedDate: now,
-      weekStart: weekStart,
-      selectedDateFromSideBarCalender: null,
-    );
-  }
-
-  DateSelectionState copyWith({
-    DateTime? selectedDate,
-    DateTime? weekStart,
-    DateTime? selectedDateFromSideBarCalender,
-  }) {
-    return DateSelectionState(
-      selectedDate: selectedDate ?? this.selectedDate,
-      weekStart: weekStart ?? this.weekStart,
-      selectedDateFromSideBarCalender: selectedDateFromSideBarCalender ?? this.selectedDateFromSideBarCalender,
-    );
-  }
-}

lib/pages/access_management/booking_system/presentation/bloc/selected_bookable_space_bloc/selected_bookable_space_bloc.dart

@@ -1,14 +0,0 @@
-import 'package:bloc/bloc.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/bookable_room.dart';
-part 'selected_bookable_space_event.dart';
-part 'selected_bookable_space_state.dart';
-
-class SelectedBookableSpaceBloc
-    extends Bloc<SelectedBookableSpaceEvent, SelectedBookableSpaceState> {
-  SelectedBookableSpaceBloc() : super(const SelectedBookableSpaceState()) {
-    on<SelectBookableSpace>((event, emit) {
-      emit(SelectedBookableSpaceState(
-          selectedBookableSpace: event.bookableSpace));
-    });
-  }
-}

lib/pages/access_management/booking_system/presentation/bloc/selected_bookable_space_bloc/selected_bookable_space_event.dart

@@ -1,11 +0,0 @@
-part of 'selected_bookable_space_bloc.dart';
-
-abstract class SelectedBookableSpaceEvent {
-  const SelectedBookableSpaceEvent();
-}
-
-class SelectBookableSpace extends SelectedBookableSpaceEvent {
-  final BookableSpaceModel bookableSpace;
-
-  const SelectBookableSpace(this.bookableSpace);
-}

lib/pages/access_management/booking_system/presentation/bloc/selected_bookable_space_bloc/selected_bookable_space_state.dart

@@ -1,9 +0,0 @@
-part of 'selected_bookable_space_bloc.dart';
-
-class SelectedBookableSpaceState {
-  final BookableSpaceModel? selectedBookableSpace;
-
-  const SelectedBookableSpaceState(
-   { this.selectedBookableSpace,}
-  );
-}

lib/pages/access_management/booking_system/presentation/bloc/sidebar/sidebar_bloc.dart

@@ -1,148 +0,0 @@
-import 'dart:async';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/load_bookable_spaces_param.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/services/bookable_system_service.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/sidebar/sidebar_event.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/sidebar/sidebar_state.dart';
-
-class SidebarBloc extends Bloc<SidebarEvent, SidebarState> {
-  final BookableSystemService _bookingService;
-  int _currentPage = 1;
-  final int _pageSize = 20;
-  String _currentSearch = '';
-
-  SidebarBloc(this._bookingService)
-      : super(SidebarState(
-          allRooms: [],
-          displayedRooms: [],
-          isLoading: true,
-          hasMore: true,
-        )) {
-    on<LoadBookableSpaces>(_onLoadBookableSpaces);
-    on<LoadMoreSpaces>(_onLoadMoreSpaces);
-    on<SelectRoomEvent>(_onSelectRoom);
-    on<SearchRoomsEvent>(_onSearchRooms);
-    on<ResetSearch>(_onResetSearch);
-  }
-
-  Future<void> _onLoadBookableSpaces(
-    LoadBookableSpaces event,
-    Emitter<SidebarState> emit,
-  ) async {
-    try {
-      emit(state.copyWith(isLoading: true, errorMessage: null));
-      _currentPage = 1;
-      _currentSearch = '';
-
-      final paginatedSpaces = await _bookingService.getBookableSpaces(
-        param: LoadBookableSpacesParam(
-          page: _currentPage,
-          size: _pageSize,
-          search: _currentSearch,
-        ),
-      );
-
-      emit(state.copyWith(
-        allRooms: paginatedSpaces.data,
-        displayedRooms: paginatedSpaces.data,
-        isLoading: false,
-        hasMore: paginatedSpaces.hasNext,
-        totalPages: paginatedSpaces.totalPage,
-        currentPage: _currentPage,
-      ));
-    } catch (e) {
-      emit(state.copyWith(
-        isLoading: false,
-        errorMessage: 'Failed to load rooms: ${e.toString()}',
-      ));
-    }
-  }
-
-  Future<void> _onLoadMoreSpaces(
-    LoadMoreSpaces event,
-    Emitter<SidebarState> emit,
-  ) async {
-    if (!state.hasMore || state.isLoadingMore) return;
-
-    try {
-      emit(state.copyWith(isLoadingMore: true));
-      _currentPage++;
-
-      final paginatedSpaces = await _bookingService.getBookableSpaces(
-        param: LoadBookableSpacesParam(
-          page: _currentPage,
-          size: _pageSize,
-          search: _currentSearch,
-        ),
-      );
-
-      final updatedRooms = [...state.allRooms, ...paginatedSpaces.data];
-
-      emit(state.copyWith(
-        allRooms: updatedRooms,
-        displayedRooms: updatedRooms,
-        isLoadingMore: false,
-        hasMore: paginatedSpaces.hasNext,
-        totalPages: paginatedSpaces.totalPage,
-        currentPage: _currentPage,
-      ));
-    } catch (e) {
-      _currentPage--;
-      emit(state.copyWith(
-        isLoadingMore: false,
-        errorMessage: 'Failed to load more rooms: ${e.toString()}',
-      ));
-    }
-  }
-
-  Future<void> _onSearchRooms(
-    SearchRoomsEvent event,
-    Emitter<SidebarState> emit,
-  ) async {
-    try {
-      _currentSearch = event.query;
-      _currentPage = 1;
-      emit(state.copyWith(isLoading: true, errorMessage: null));
-      final paginatedSpaces = await _bookingService.getBookableSpaces(
-        param: LoadBookableSpacesParam(
-          page: _currentPage,
-          size: _pageSize,
-          search: _currentSearch,
-        ),
-      );
-      emit(state.copyWith(
-        allRooms: paginatedSpaces.data,
-        displayedRooms: paginatedSpaces.data,
-        isLoading: false,
-        hasMore: paginatedSpaces.hasNext,
-        totalPages: paginatedSpaces.totalPage,
-        currentPage: _currentPage,
-      ));
-    } catch (e) {
-      emit(state.copyWith(
-        isLoading: false,
-        errorMessage: 'Search failed: ${e.toString()}',
-      ));
-    }
-  }
-
-  void _onResetSearch(
-    ResetSearch event,
-    Emitter<SidebarState> emit,
-  ) {
-    _currentSearch = '';
-    add(LoadBookableSpaces());
-  }
-
-  void _onSelectRoom(
-    SelectRoomEvent event,
-    Emitter<SidebarState> emit,
-  ) {
-    emit(state.copyWith(selectedRoomId: event.roomId));
-  }
-
-  @override
-  Future<void> close() {
-    return super.close();
-  }
-}

lib/pages/access_management/booking_system/presentation/bloc/sidebar/sidebar_event.dart

@@ -1,25 +0,0 @@
-abstract class SidebarEvent {}
-
-class LoadBookableSpaces extends SidebarEvent {}
-
-class SelectRoomEvent extends SidebarEvent {
-  final String roomId;
-
-  SelectRoomEvent(this.roomId);
-}
-
-class SearchRoomsEvent extends SidebarEvent {
-  final String query;
-
-  SearchRoomsEvent(this.query);
-}
-
-class LoadMoreSpaces extends SidebarEvent {}
-
-class ResetSearch extends SidebarEvent {}
-
-class ExecuteSearch extends SidebarEvent {
-  final String query;
-
-  ExecuteSearch(this.query);
-}

lib/pages/access_management/booking_system/presentation/bloc/sidebar/sidebar_state.dart

@@ -1,49 +0,0 @@
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/bookable_room.dart';
-
-class SidebarState {
-  final List<BookableSpaceModel> allRooms;
-  final List<BookableSpaceModel> displayedRooms;
-  final bool isLoading;
-  final bool isLoadingMore;
-  final String? errorMessage;
-  final String? selectedRoomId;
-  final bool hasMore;
-  final int totalPages;
-  final int currentPage;
-
-  SidebarState({
-    required this.allRooms,
-    required this.displayedRooms,
-    required this.isLoading,
-    this.isLoadingMore = false,
-    this.errorMessage,
-    this.selectedRoomId,
-    this.hasMore = true,
-    this.totalPages = 0,
-    this.currentPage = 1,
-  });
-
-  SidebarState copyWith({
-    List<BookableSpaceModel>? allRooms,
-    List<BookableSpaceModel>? displayedRooms,
-    bool? isLoading,
-    bool? isLoadingMore,
-    String? errorMessage,
-    String? selectedRoomId,
-    bool? hasMore,
-    int? totalPages,
-    int? currentPage,
-  }) {
-    return SidebarState(
-      allRooms: allRooms ?? this.allRooms,
-      displayedRooms: displayedRooms ?? this.displayedRooms,
-      isLoading: isLoading ?? this.isLoading,
-      isLoadingMore: isLoadingMore ?? this.isLoadingMore,
-      errorMessage: errorMessage ?? this.errorMessage,
-      selectedRoomId: selectedRoomId ?? this.selectedRoomId,
-      hasMore: hasMore ?? this.hasMore,
-      totalPages: totalPages ?? this.totalPages,
-      currentPage: currentPage ?? this.currentPage,
-    );
-  }
-}

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

@@ -1,240 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.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';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/selected_bookable_space_bloc/selected_bookable_space_bloc.dart';
-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';
-
-class BookingPage extends StatefulWidget {
-  const BookingPage({super.key});
-
-  @override
-  State<BookingPage> createState() => _BookingPageState();
-}
-
-class _BookingPageState extends State<BookingPage> {
-  late final EventController _eventController;
-
-  @override
-  void initState() {
-    super.initState();
-    _eventController = EventController();
-  }
-
-  @override
-  void dispose() {
-    _eventController.dispose();
-    super.dispose();
-  }
-
-  void _dispatchLoadEvents(BuildContext context) {
-    final selectedRoom =
-        context.read<SelectedBookableSpaceBloc>().state.selectedBookableSpace;
-    final dateState = context.read<DateSelectionBloc>().state;
-
-    if (selectedRoom != null) {
-      context.read<CalendarEventsBloc>().add(
-            LoadEvents(
-              spaceId: selectedRoom.uuid,
-              weekStart: dateState.weekStart,
-              weekEnd: dateState.weekStart.add(const Duration(days: 6)),
-            ),
-          );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MultiBlocProvider(
-      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),
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Expanded(
-                    child: Container(
-                      decoration: BoxDecoration(
-                        color: ColorsManager.whiteColors,
-                        boxShadow: [
-                          BoxShadow(
-                            color: ColorsManager.blackColor.withOpacity(0.1),
-                            offset: const Offset(3, 0),
-                            blurRadius: 6,
-                            spreadRadius: 0,
-                          ),
-                        ],
-                      ),
-                      child: Column(
-                        children: [
-                          Expanded(
-                            flex: 2,
-                            child: BlocBuilder<SelectedBookableSpaceBloc,
-                                SelectedBookableSpaceState>(
-                              builder: (context, state) {
-                                return BookingSidebar(
-                                  onRoomSelected: (selectedRoom) {
-                                    context
-                                        .read<SelectedBookableSpaceBloc>()
-                                        .add(SelectBookableSpace(selectedRoom));
-                                  },
-                                );
-                              },
-                            ),
-                          ),
-                          Expanded(
-                            child: BlocBuilder<DateSelectionBloc,
-                                DateSelectionState>(
-                              builder: (context, dateState) {
-                                return CustomCalendarPage(
-                                  selectedDate: dateState.selectedDate,
-                                  onDateChanged: (day, month, year) {
-                                    final newDate = DateTime(year, month, day);
-                                    context
-                                        .read<DateSelectionBloc>()
-                                        .add(SelectDate(newDate));
-                                    context.read<DateSelectionBloc>().add(
-                                        SelectDateFromSidebarCalendar(newDate));
-                                  },
-                                );
-                              },
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                  Expanded(
-                    flex: 4,
-                    child: Padding(
-                      padding: const EdgeInsets.all(20.0),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
-                              Row(
-                                children: [
-                                  SvgTextButton(
-                                    svgAsset: Assets.homeIcon,
-                                    label: 'Manage Bookable Spaces',
-                                    onPressed: () {},
-                                  ),
-                                  const SizedBox(width: 20),
-                                  SvgTextButton(
-                                    svgAsset: Assets.groupIcon,
-                                    label: 'Manage Users',
-                                    onPressed: () {},
-                                  ),
-                                ],
-                              ),
-                              BlocBuilder<DateSelectionBloc,
-                                  DateSelectionState>(
-                                builder: (context, state) {
-                                  final weekStart = state.weekStart;
-                                  final weekEnd =
-                                      weekStart.add(const Duration(days: 6));
-                                  return WeekNavigation(
-                                    weekStart: weekStart,
-                                    weekEnd: weekEnd,
-                                    onPreviousWeek: () {
-                                      context
-                                          .read<DateSelectionBloc>()
-                                          .add(PreviousWeek());
-                                    },
-                                    onNextWeek: () {
-                                      context
-                                          .read<DateSelectionBloc>()
-                                          .add(NextWeek());
-                                    },
-                                  );
-                                },
-                              ),
-                            ],
-                          ),
-                          Expanded(
-                            child: BlocBuilder<SelectedBookableSpaceBloc,
-                                SelectedBookableSpaceState>(
-                              builder: (context, roomState) {
-                                final selectedRoom =
-                                    roomState.selectedBookableSpace;
-                                return BlocBuilder<DateSelectionBloc,
-                                    DateSelectionState>(
-                                  builder: (context, dateState) {
-                                    return BlocListener<CalendarEventsBloc,
-                                        CalendarEventState>(
-                                      listenWhen: (prev, curr) =>
-                                          curr is EventsLoaded,
-                                      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,
-                                        selectedDateFromSideBarCalender: context
-                                            .watch<DateSelectionBloc>()
-                                            .state
-                                            .selectedDateFromSideBarCalender,
-                                      ),
-                                    );
-                                  },
-                                );
-                              },
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,242 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/data/services/remote_bookable_spaces_service.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/bookable_room.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/sidebar/sidebar_bloc.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/sidebar/sidebar_event.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/bloc/sidebar/sidebar_state.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/widgets/room_list_item.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';
-
-class BookingSidebar extends StatelessWidget {
-  final void Function(BookableSpaceModel) onRoomSelected;
-
-  const BookingSidebar({
-    super.key,
-    required this.onRoomSelected,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => SidebarBloc(RemoteBookableSpacesService(
-        HTTPService(),
-      ))
-        ..add(LoadBookableSpaces()),
-      child: _SidebarContent(onRoomSelected: onRoomSelected),
-    );
-  }
-}
-
-class _SidebarContent extends StatefulWidget {
-  final void Function(BookableSpaceModel) onRoomSelected;
-
-  const _SidebarContent({
-    required this.onRoomSelected,
-  });
-
-  @override
-  State<_SidebarContent> createState() => __SidebarContentState();
-}
-
-class __SidebarContentState extends State<_SidebarContent> {
-  final TextEditingController searchController = TextEditingController();
-  final ScrollController _scrollController = ScrollController();
-
-  @override
-  void initState() {
-    super.initState();
-    _scrollController.addListener(_scrollListener);
-  }
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
-
-  void _scrollListener() {
-    if (_scrollController.position.pixels ==
-        _scrollController.position.maxScrollExtent) {
-      context.read<SidebarBloc>().add(LoadMoreSpaces());
-    }
-  }
-
-  void _handleSearch(String value) {
-    context.read<SidebarBloc>().add(SearchRoomsEvent(value));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocConsumer<SidebarBloc, SidebarState>(
-      listener: (context, state) {
-        if (state.currentPage == 1 && searchController.text.isNotEmpty) {
-          searchController.clear();
-        }
-      },
-      builder: (context, state) {
-        return Column(
-          children: [
-            const _SidebarHeader(title: 'Spaces'),
-            Container(
-              decoration: BoxDecoration(
-                color: ColorsManager.whiteColors,
-                borderRadius: BorderRadius.circular(8.0),
-                boxShadow: [
-                  BoxShadow(
-                    color: ColorsManager.blackColor.withOpacity(0.1),
-                    offset: const Offset(0, -2),
-                    blurRadius: 4,
-                    spreadRadius: 0,
-                  ),
-                  BoxShadow(
-                    color: ColorsManager.blackColor.withOpacity(0.1),
-                    offset: const Offset(0, 2),
-                    blurRadius: 4,
-                    spreadRadius: 0,
-                  ),
-                ],
-              ),
-              child: Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: Container(
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(
-                        horizontal: 16.0, vertical: 8.0),
-                    child: Container(
-                      decoration: BoxDecoration(
-                        color: ColorsManager.counterBackgroundColor,
-                        borderRadius: BorderRadius.circular(8.0),
-                      ),
-                      child: Row(
-                        children: [
-                          Expanded(
-                            child: TextField(
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .bodyMedium
-                                  ?.copyWith(
-                                    color: ColorsManager.blackColor,
-                                  ),
-                              controller: searchController,
-                              onChanged: _handleSearch,
-                              decoration: InputDecoration(
-                                hintText: 'Search',
-                                suffixIcon: Padding(
-                                  padding: const EdgeInsets.all(8.0),
-                                  child: SizedBox(
-                                    width: 20,
-                                    height: 20,
-                                    child: SvgPicture.asset(
-                                      Assets.searchIconUser,
-                                      color: ColorsManager.primaryTextColor,
-                                    ),
-                                  ),
-                                ),
-                                contentPadding: const EdgeInsets.symmetric(
-                                    vertical: 8, horizontal: 12),
-                                border: const OutlineInputBorder(
-                                    borderSide: BorderSide.none),
-                              ),
-                            ),
-                          ),
-                          if (searchController.text.isNotEmpty)
-                            IconButton(
-                              icon: const Icon(Icons.close),
-                              onPressed: () {
-                                context.read<SidebarBloc>().add(ResetSearch());
-                              },
-                            ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-            if (state.isLoading)
-              const Expanded(
-                child: Center(child: CircularProgressIndicator()),
-              )
-            else if (state.errorMessage != null)
-              Expanded(
-                child: Center(child: Text(state.errorMessage!)),
-              )
-            else
-              Expanded(
-                child: ListView.builder(
-                  controller: _scrollController,
-                  itemCount:
-                      state.displayedRooms.length + (state.hasMore ? 1 : 0),
-                  itemBuilder: (context, index) {
-                    if (index == state.displayedRooms.length) {
-                      return _buildLoadMoreIndicator(state);
-                    }
-
-                    final room = state.displayedRooms[index];
-                    return RoomListItem(
-                      room: room,
-                      isSelected: state.selectedRoomId == room.uuid,
-                      onTap: () {
-                        context
-                            .read<SidebarBloc>()
-                            .add(SelectRoomEvent(room.uuid));
-                        widget.onRoomSelected(room);
-                      },
-                    );
-                  },
-                ),
-              ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildLoadMoreIndicator(SidebarState state) {
-    if (state.isLoadingMore) {
-      return const Padding(
-        padding: EdgeInsets.symmetric(vertical: 16.0),
-        child: Center(child: CircularProgressIndicator()),
-      );
-    } else if (state.hasMore) {
-      return const Padding(
-        padding: EdgeInsets.symmetric(vertical: 16.0),
-        child: Center(child: Text('Scroll to load more')),
-      );
-    } else {
-      return const SizedBox.shrink();
-    }
-  }
-}
-
-class _SidebarHeader extends StatelessWidget {
-  final String title;
-
-  const _SidebarHeader({
-    required this.title,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(16.0),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            title,
-            style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                  fontWeight: FontWeight.w400,
-                  color: ColorsManager.primaryTextColor,
-                  fontSize: 20,
-                ),
-          ),
-        ],
-      ),
-    );
-  }
-}

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

@@ -1,83 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:calendar_date_picker2/calendar_date_picker2.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class CustomCalendarPage extends StatefulWidget {
-  final DateTime selectedDate;
-  final Function(int day, int month, int year) onDateChanged;
-
-  const CustomCalendarPage({
-    super.key,
-    required this.selectedDate,
-    required this.onDateChanged,
-  });
-
-  @override
-  State<CustomCalendarPage> createState() => _CustomCalendarPageState();
-}
-
-class _CustomCalendarPageState extends State<CustomCalendarPage> {
-  late DateTime _selectedDate;
-
-  @override
-  void initState() {
-    super.initState();
-    _selectedDate = widget.selectedDate;
-  }
-
-  @override
-  void didUpdateWidget(CustomCalendarPage oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (widget.selectedDate != oldWidget.selectedDate) {
-      setState(() {
-        _selectedDate = widget.selectedDate;
-      });
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final config = CalendarDatePicker2Config(
-      calendarType: CalendarDatePicker2Type.single,
-      selectedDayHighlightColor: const Color(0xFF3B82F6),
-      selectedDayTextStyle: const TextStyle(
-        color: Colors.white,
-        fontWeight: FontWeight.w400,
-        fontSize: 14,
-      ),
-      dayTextStyle: const TextStyle(
-        color: ColorsManager.blackColor,
-        fontWeight: FontWeight.w400,
-        fontSize: 14,
-      ),
-      weekdayLabelTextStyle: const TextStyle(
-        color: ColorsManager.grey50,
-        fontWeight: FontWeight.w400,
-        fontSize: 14,
-      ),
-      controlsTextStyle: const TextStyle(
-        color: Color(0xFF232D3A),
-        fontWeight: FontWeight.w400,
-        fontSize: 18,
-      ),
-      centerAlignModePicker: false,
-      disableMonthPicker: true,
-      firstDayOfWeek: 1,
-      weekdayLabels: const ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'],
-    );
-
-    return CalendarDatePicker2(
-      config: config,
-      value: [_selectedDate],
-      onValueChanged: (dates) {
-        final picked = dates.first;
-        if (picked != null) {
-          setState(() {
-            _selectedDate = picked;
-          });
-          widget.onDateChanged(picked.day, picked.month, picked.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/icon_text_button.dart

@@ -1,72 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class SvgTextButton extends StatelessWidget {
-  final String svgAsset;
-  final String label;
-  final VoidCallback onPressed;
-  final Color backgroundColor;
-  final Color svgColor;
-  final Color labelColor;
-  final double borderRadius;
-  final List<BoxShadow> boxShadow;
-  final double svgSize;
-
-  const SvgTextButton({
-    super.key,
-    required this.svgAsset,
-    required this.label,
-    required this.onPressed,
-    this.backgroundColor = ColorsManager.circleRolesBackground,
-    this.svgColor = const Color(0xFF496EFF),
-    this.labelColor = Colors.black,
-    this.borderRadius = 10.0,
-    this.boxShadow = const [
-      BoxShadow(
-        color: ColorsManager.lightGrayColor,
-        blurRadius: 4,
-        offset: Offset(0, 1),
-      ),
-    ],
-    this.svgSize = 24.0,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Material(
-      color: Colors.transparent,
-      child: InkWell(
-        borderRadius: BorderRadius.circular(borderRadius),
-        onTap: onPressed,
-        child: Container(
-          padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
-          decoration: BoxDecoration(
-            color: backgroundColor,
-            borderRadius: BorderRadius.circular(borderRadius),
-            boxShadow: boxShadow,
-          ),
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              SvgPicture.asset(
-                svgAsset,
-                width: svgSize,
-                height: svgSize,
-              ),
-              const SizedBox(width: 12),
-              Text(
-                label,
-                style: TextStyle(
-                  color: labelColor,
-                  fontSize: 12,
-                  fontWeight: FontWeight.w400,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,42 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/domain/models/bookable_room.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class RoomListItem extends StatelessWidget {
-  final BookableSpaceModel room;
-  final bool isSelected;
-  final VoidCallback onTap;
-
-  const RoomListItem({
-    required this.room,
-    required this.isSelected,
-    required this.onTap,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return RadioListTile(
-      value: room.uuid,
-      contentPadding: const EdgeInsetsDirectional.symmetric(horizontal: 16),
-      groupValue: isSelected ? room.uuid : null,
-      visualDensity: const VisualDensity(vertical: -4),
-      onChanged: (value) => onTap(),
-      activeColor: ColorsManager.primaryColor,
-      title: Text(
-        room.spaceName,
-        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-            color: ColorsManager.lightGrayColor,
-            fontWeight: FontWeight.w700,
-            fontSize: 12),
-      ),
-      subtitle: Text(
-        room.virtualLocation,
-        style: Theme.of(context).textTheme.bodySmall?.copyWith(
-              fontSize: 10,
-              fontWeight: FontWeight.w400,
-              color: ColorsManager.textGray,
-            ),
-      ),
-    );
-  }
-}

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,218 +0,0 @@
-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: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 {
-  final DateTime weekStart;
-  final DateTime selectedDate;
-  final EventController eventController;
-  final String? startTime;
-  final String? endTime;
-  final DateTime? selectedDateFromSideBarCalender;
-
-  const WeeklyCalendarPage({
-    super.key,
-    required this.weekStart,
-    required this.selectedDate,
-    required this.eventController,
-    this.startTime,
-    this.endTime,
-    this.selectedDateFromSideBarCalender,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final startHour = _parseHour(startTime, defaultValue: 0);
-    final endHour = _parseHour(endTime, defaultValue: 24);
-
-    if (endTime == null || endTime!.isEmpty) {
-      return const Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            Icon(
-              Icons.calendar_today,
-              color: ColorsManager.lightGrayColor,
-              size: 80,
-            ),
-            SizedBox(height: 20),
-            Text(
-              'Please select a bookable space to view the calendar.',
-              style: TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.w500,
-                  color: ColorsManager.lightGrayColor),
-            ),
-          ],
-        ),
-      );
-    }
-
-    final weekDays = _getWeekDays(weekStart);
-
-    final selectedDayIndex =
-        weekDays.indexWhere((d) => isSameDay(d, selectedDate));
-    final selectedSidebarIndex = selectedDateFromSideBarCalender == null
-        ? -1
-        : weekDays
-            .indexWhere((d) => isSameDay(d, selectedDateFromSideBarCalender!));
-
-    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,
-                initialDay: weekStart,
-                startHour: startHour - 1,
-                endHour: endHour,
-                heightPerMinute: 1.1,
-                showLiveTimeLineInAllDays: false,
-                showVerticalLines: true,
-                emulateVerticalOffsetBy: -80,
-                startDay: WeekDays.monday,
-                liveTimeIndicatorSettings: const LiveTimeIndicatorSettings(
-                  showBullet: false,
-                  height: 0,
-                ),
-                weekDayBuilder: (date) {
-                  return WeekDayHeader(
-                    date: date,
-                    isSelectedDay: isSameDay(date, selectedDate),
-                  );
-                },
-                timeLineBuilder: (date) {
-                  return TimeLineWidget(date: date);
-                },
-                timeLineWidth: timeLineWidth,
-                weekPageHeaderBuilder: (start, end) => Container(),
-                weekTitleHeight: 60,
-                weekNumberBuilder: (firstDayOfWeek) => Padding(
-                  padding: const EdgeInsets.only(right: 15, bottom: 10),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.end,
-                    mainAxisAlignment: MainAxisAlignment.end,
-                    children: [
-                      Text(
-                        firstDayOfWeek.timeZoneName.replaceAll(':00', ''),
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                              fontSize: 12,
-                              color: ColorsManager.blackColor,
-                              fontWeight: FontWeight.w400,
-                            ),
-                      ),
-                    ],
-                  ),
-                ),
-                eventTileBuilder: (date, events, boundary, start, end) {
-                  return EventTileWidget(
-                    events: events,
-                  );
-                },
-              ),
-              if (selectedDayIndex >= 0)
-                Positioned(
-                  left: (timeLineWidth + 3) +
-                      (dayColumnWidth - 8) * (selectedDayIndex - 0.01),
-                  top: 0,
-                  bottom: 0,
-                  width: dayColumnWidth,
-                  child: IgnorePointer(
-                    child: Container(
-                      margin: const EdgeInsets.symmetric(
-                          vertical: 0, horizontal: 4),
-                      color: ColorsManager.spaceColor.withOpacity(0.07),
-                    ),
-                  ),
-                ),
-              if (selectedSidebarIndex >= 0 &&
-                  selectedSidebarIndex != selectedDayIndex)
-                Positioned(
-                  left: (timeLineWidth + 3) +
-                      (dayColumnWidth - 8) * (selectedSidebarIndex - 0.01),
-                  top: 0,
-                  bottom: 0,
-                  width: dayColumnWidth,
-                  child: IgnorePointer(
-                    child: Container(
-                      margin: const EdgeInsets.symmetric(
-                          vertical: 0, horizontal: 4),
-                      color: Colors.orange.withOpacity(0.14),
-                    ),
-                  ),
-                ),
-              Positioned(
-                right: 0,
-                top: 50,
-                bottom: 0,
-                child: IgnorePointer(
-                  child: Container(
-                    width: 1,
-                    color: Theme.of(context).scaffoldBackgroundColor,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  List<DateTime> _getWeekDays(DateTime date) {
-    final int weekday = date.weekday;
-    final DateTime monday = date.subtract(Duration(days: weekday - 1));
-    return List.generate(7, (i) => monday.add(Duration(days: i)));
-  }
-}
-
-bool isSameDay(DateTime d1, DateTime d2) {
-  return d1.year == d2.year && d1.month == d2.month && d1.day == d2.day;
-}
-
-int _parseHour(String? time, {required int defaultValue}) {
-  if (time == null || time.isEmpty || !time.contains(':')) {
-    return defaultValue;
-  }
-  try {
-    return int.parse(time.split(':')[0]);
-  } catch (e) {
-    return defaultValue;
-  }
-}

lib/pages/access_management/view/access_management.dart

@@ -2,86 +2,302 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
-import 'package:syncrow_web/pages/access_management/booking_system/presentation/view/booking_page.dart';
-import 'package:syncrow_web/pages/access_management/view/access_overview_content.dart';
+import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
+import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/common/buttons/search_reset_buttons.dart';
+import 'package:syncrow_web/pages/common/custom_table.dart';
+import 'package:syncrow_web/pages/common/date_time_widget.dart';
+import 'package:syncrow_web/pages/common/filter/filter_widget.dart';
+import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart';
+// import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/app_enum.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+import 'package:syncrow_web/utils/style.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class AccessManagementPage extends StatefulWidget {
+class AccessManagementPage extends StatelessWidget with HelperResponsiveLayout {
   const AccessManagementPage({super.key});
 
-  @override
-  State<AccessManagementPage> createState() => _AccessManagementPageState();
-}
-
-class _AccessManagementPageState extends State<AccessManagementPage>
-    with HelperResponsiveLayout {
-  final PageController _pageController = PageController(initialPage: 0);
-  int _currentPageIndex = 0;
-
-  @override
-  void dispose() {
-    _pageController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (BuildContext context) => AccessBloc()..add(FetchTableData()),
-      child: WebScaffold(
+    final isLargeScreen = isLargeScreenSize(context);
+    final isSmallScreen = isSmallScreenSize(context);
+    final isHalfMediumScreen = isHafMediumScreenSize(context);
+    final padding =
+        isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
+
+    return WebScaffold(
         enableMenuSidebar: false,
         appBarTitle: Text(
           'Access Management',
           style: ResponsiveTextTheme.of(context).deviceManagementTitle,
         ),
-        centerBody: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            TextButton(
-              onPressed: () => _switchPage(0),
-              child: Text(
-                'Access Overview',
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: _currentPageIndex == 0 ? Colors.white : Colors.grey,
-                  fontWeight: _currentPageIndex == 0
-                      ? FontWeight.w700
-                      : FontWeight.w400,
-                ),
-              ),
-            ),
-            TextButton(
-              onPressed: () => _switchPage(1),
-              child: Text(
-                'Booking System',
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: _currentPageIndex == 1 ? Colors.white : Colors.grey,
-                  fontWeight: _currentPageIndex == 1
-                      ? FontWeight.w700
-                      : FontWeight.w400,
-                ),
-              ),
-            ),
-          ],
-        ),
         rightBody: const NavigateHomeGridView(),
-        scaffoldBody: PageView(
-          controller: _pageController,
-          physics: const NeverScrollableScrollPhysics(),
-          children: const [
-            AccessOverviewContent(),
-            BookingPage(),
-          ],
+        scaffoldBody: BlocProvider(
+            create: (BuildContext context) =>
+                AccessBloc()..add(FetchTableData()),
+            child: BlocConsumer<AccessBloc, AccessState>(
+                listener: (context, state) {},
+                builder: (context, state) {
+                  final accessBloc = BlocProvider.of<AccessBloc>(context);
+                  final filteredData = accessBloc.filteredData;
+                  return state is AccessLoaded
+                      ? const Center(child: CircularProgressIndicator())
+                      : Container(
+                          padding: padding,
+                          height: MediaQuery.of(context).size.height,
+                          width: MediaQuery.of(context).size.width,
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              FilterWidget(
+                                size: MediaQuery.of(context).size,
+                                tabs: accessBloc.tabs,
+                                selectedIndex: accessBloc.selectedIndex,
+                                onTabChanged: (index) {
+                                  accessBloc.add(TabChangedEvent(index));
+                                },
+                              ),
+                              const SizedBox(height: 20),
+                              if (isSmallScreen || isHalfMediumScreen)
+                                _buildSmallSearchFilters(context, accessBloc)
+                              else
+                                _buildNormalSearchWidgets(context, accessBloc),
+                              const SizedBox(height: 20),
+                              _buildVisitorAdminPasswords(context, accessBloc),
+                              const SizedBox(height: 20),
+                              Expanded(
+                                  child: DynamicTable(
+                                tableName: 'AccessManagement',
+                                uuidIndex: 1,
+                                withSelectAll: true,
+                                isEmpty: filteredData.isEmpty,
+                                withCheckBox: false,
+                                size: MediaQuery.of(context).size,
+                                cellDecoration: containerDecoration,
+                                headers: const [
+                                  'Name',
+                                  'Access Type',
+                                  'Access Start',
+                                  'Access End',
+                                  'Accessible Device',
+                                  'Authorizer',
+                                  'Authorization Date & Time',
+                                  'Access Status'
+                                ],
+                                data: filteredData.map((item) {
+                                  return [
+                                    item.passwordName,
+                                    item.passwordType.value,
+                                    accessBloc
+                                        .timestampToDate(item.effectiveTime),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
+                                    item.deviceName.toString(),
+                                    item.authorizerEmail.toString(),
+                                    accessBloc
+                                        .timestampToDate(item.invalidTime),
+                                    item.passwordStatus.value,
+                                  ];
+                                }).toList(),
+                              )),
+                            ],
+                          ),
+                        );
+                })));
+  }
+
+  Wrap _buildVisitorAdminPasswords(
+      BuildContext context, AccessBloc accessBloc) {
+    return Wrap(
+      spacing: 10,
+      runSpacing: 10,
+      children: [
+        Container(
+          width: 205,
+          height: 42,
+          decoration: containerDecoration,
+          child: DefaultButton(
+              onPressed: () {
+                showDialog(
+                  context: context,
+                  barrierDismissible: false,
+                  builder: (BuildContext context) {
+                    return const VisitorPasswordDialog();
+                  },
+                ).then((v) {
+                  if (v != null) {
+                    accessBloc.add(FetchTableData());
+                  }
+                });
+              },
+              borderRadius: 8,
+              child: Text(
+                'Create Visitor Password ',
+                style: context.textTheme.titleSmall!
+                    .copyWith(color: Colors.white, fontSize: 12),
+              )),
         ),
-      ),
+        // Container(
+        //   width: 133,
+        //   height: 42,
+        //   decoration: containerDecoration,
+        //   child: DefaultButton(
+        //       borderRadius: 8,
+        //       backgroundColor: ColorsManager.whiteColors,
+        //       child: Text(
+        //         'Admin Password',
+        //         style: context.textTheme.titleSmall!
+        //             .copyWith(color: Colors.black, fontSize: 12),
+        //       )),
+        // ),
+      ],
     );
   }
 
-  void _switchPage(int index) {
-    setState(() => _currentPageIndex = index);
-    _pageController.jumpToPage(index);
+  Row _buildNormalSearchWidgets(BuildContext context, AccessBloc accessBloc) {
+    // TimeOfDay _selectedTime = TimeOfDay.now();
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.end,
+      textBaseline: TextBaseline.ideographic,
+      children: [
+        SizedBox(
+          width: 250,
+          child: CustomWebTextField(
+            controller: accessBloc.passwordName,
+            height: 43,
+            isRequired: false,
+            textFieldName: 'Name',
+            description: '',
+            onSubmitted: (value) {
+              accessBloc.add(FilterDataEvent(
+                  emailAuthorizer:
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
+                  passwordName: accessBloc.passwordName.text.toLowerCase(),
+                  startTime: accessBloc.effectiveTimeTimeStamp,
+                  endTime: accessBloc.expirationTimeTimeStamp));
+            },
+          ),
+        ),
+        const SizedBox(width: 15),
+        SizedBox(
+          width: 250,
+          child: CustomWebTextField(
+            controller: accessBloc.emailAuthorizer,
+            height: 43,
+            isRequired: false,
+            textFieldName: 'Authorizer',
+            description: '',
+            onSubmitted: (value) {
+              accessBloc.add(FilterDataEvent(
+                  emailAuthorizer:
+                      accessBloc.emailAuthorizer.text.toLowerCase(),
+                  selectedTabIndex:
+                      BlocProvider.of<AccessBloc>(context).selectedIndex,
+                  passwordName: accessBloc.passwordName.text.toLowerCase(),
+                  startTime: accessBloc.effectiveTimeTimeStamp,
+                  endTime: accessBloc.expirationTimeTimeStamp));
+            },
+          ),
+        ),
+        const SizedBox(width: 15),
+        SizedBox(
+          child: DateTimeWebWidget(
+            icon: Assets.calendarIcon,
+            isRequired: false,
+            title: 'Access Time',
+            size: MediaQuery.of(context).size,
+            endTime: () {
+              accessBloc.add(SelectTime(context: context, isStart: false));
+            },
+            startTime: () {
+              accessBloc.add(SelectTime(context: context, isStart: true));
+            },
+            firstString: BlocProvider.of<AccessBloc>(context).startTime,
+            secondString: BlocProvider.of<AccessBloc>(context).endTime,
+          ),
+        ),
+        const SizedBox(width: 15),
+        SearchResetButtons(
+          onSearch: () {
+            accessBloc.add(FilterDataEvent(
+                emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
+                passwordName: accessBloc.passwordName.text.toLowerCase(),
+                startTime: accessBloc.effectiveTimeTimeStamp,
+                endTime: accessBloc.expirationTimeTimeStamp));
+          },
+          onReset: () {
+            accessBloc.add(ResetSearch());
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildSmallSearchFilters(BuildContext context, AccessBloc accessBloc) {
+    return Wrap(
+      spacing: 20,
+      runSpacing: 10,
+      children: [
+        SizedBox(
+          width: 300,
+          child: CustomWebTextField(
+              controller: accessBloc.passwordName,
+              isRequired: true,
+              height: 40,
+              textFieldName: 'Name',
+              description: '',
+              onSubmitted: (value) {
+                accessBloc.add(FilterDataEvent(
+                    emailAuthorizer:
+                        accessBloc.emailAuthorizer.text.toLowerCase(),
+                    selectedTabIndex:
+                        BlocProvider.of<AccessBloc>(context).selectedIndex,
+                    passwordName: accessBloc.passwordName.text.toLowerCase(),
+                    startTime: accessBloc.effectiveTimeTimeStamp,
+                    endTime: accessBloc.expirationTimeTimeStamp));
+              }),
+        ),
+        DateTimeWebWidget(
+          icon: Assets.calendarIcon,
+          isRequired: false,
+          title: 'Access Time',
+          size: MediaQuery.of(context).size,
+          endTime: () {
+            accessBloc.add(SelectTime(context: context, isStart: false));
+          },
+          startTime: () {
+            accessBloc.add(SelectTime(context: context, isStart: true));
+          },
+          firstString: BlocProvider.of<AccessBloc>(context).startTime,
+          secondString: BlocProvider.of<AccessBloc>(context).endTime,
+        ),
+        SearchResetButtons(
+          onSearch: () {
+            accessBloc.add(FilterDataEvent(
+                emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
+                selectedTabIndex:
+                    BlocProvider.of<AccessBloc>(context).selectedIndex,
+                passwordName: accessBloc.passwordName.text.toLowerCase(),
+                startTime: accessBloc.effectiveTimeTimeStamp,
+                endTime: accessBloc.expirationTimeTimeStamp));
+          },
+          onReset: () {
+            accessBloc.add(ResetSearch());
+          },
+        ),
+      ],
+    );
   }
 }

lib/pages/access_management/view/access_overview_content.dart

@@ -1,289 +0,0 @@
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/common/buttons/search_reset_buttons.dart';
-import 'package:syncrow_web/pages/common/custom_table.dart';
-import 'package:syncrow_web/pages/common/date_time_widget.dart';
-import 'package:syncrow_web/pages/common/filter/filter_widget.dart';
-import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
-import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart';
-import 'package:syncrow_web/utils/constants/app_enum.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/access_management/bloc/access_bloc.dart';
-import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
-import 'package:syncrow_web/utils/style.dart';
-
-class AccessOverviewContent extends StatelessWidget
-    with HelperResponsiveLayout {
-  const AccessOverviewContent({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final isLargeScreen = isLargeScreenSize(context);
-    final isSmallScreen = isSmallScreenSize(context);
-    final isHalfMediumScreen = isHafMediumScreenSize(context);
-    final padding =
-        isLargeScreen ? const EdgeInsets.all(30) : const EdgeInsets.all(15);
-
-    return BlocProvider(
-        create: (BuildContext context) => AccessBloc()..add(FetchTableData()),
-        child: BlocConsumer<AccessBloc, AccessState>(
-            listener: (context, state) {},
-            builder: (context, state) {
-              final accessBloc = BlocProvider.of<AccessBloc>(context);
-              final filteredData = accessBloc.filteredData;
-              return state is AccessLoaded
-                  ? const Center(child: CircularProgressIndicator())
-                  : Container(
-                      padding: padding,
-                      height: MediaQuery.of(context).size.height,
-                      width: MediaQuery.of(context).size.width,
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          FilterWidget(
-                            size: MediaQuery.of(context).size,
-                            tabs: accessBloc.tabs,
-                            selectedIndex: accessBloc.selectedIndex,
-                            onTabChanged: (index) {
-                              accessBloc.add(TabChangedEvent(index));
-                            },
-                          ),
-                          const SizedBox(height: 20),
-                          if (isSmallScreen || isHalfMediumScreen)
-                            _buildSmallSearchFilters(context, accessBloc)
-                          else
-                            _buildNormalSearchWidgets(context, accessBloc),
-                          const SizedBox(height: 20),
-                          _buildVisitorAdminPasswords(context, accessBloc),
-                          const SizedBox(height: 20),
-                          Expanded(
-                              child: DynamicTable(
-                            tableName: 'AccessManagement',
-                            uuidIndex: 1,
-                            withSelectAll: true,
-                            isEmpty: filteredData.isEmpty,
-                            withCheckBox: false,
-                            size: MediaQuery.of(context).size,
-                            cellDecoration: containerDecoration,
-                            headers: const [
-                              'Name',
-                              'Access Type',
-                              'Access Start',
-                              'Access End',
-                              'Accessible Device',
-                              'Authorizer',
-                              'Authorization Date & Time',
-                              'Access Status'
-                            ],
-                            data: filteredData.map((item) {
-                              return [
-                                item.passwordName,
-                                item.passwordType.value,
-                                accessBloc.timestampToDate(item.effectiveTime),
-                                accessBloc.timestampToDate(item.invalidTime),
-                                item.deviceName.toString(),
-                                item.authorizerEmail.toString(),
-                                accessBloc.timestampToDate(item.invalidTime),
-                                item.passwordStatus.value,
-                              ];
-                            }).toList(),
-                          )),
-                        ],
-                      ),
-                    );
-            }));
-  }
-
-  Wrap _buildVisitorAdminPasswords(
-      BuildContext context, AccessBloc accessBloc) {
-    return Wrap(
-      spacing: 10,
-      runSpacing: 10,
-      children: [
-        Container(
-          width: 205,
-          height: 42,
-          decoration: containerDecoration,
-          child: DefaultButton(
-              onPressed: () {
-                showDialog(
-                  context: context,
-                  barrierDismissible: false,
-                  builder: (BuildContext context) {
-                    return const VisitorPasswordDialog();
-                  },
-                ).then((v) {
-                  if (v != null) {
-                    accessBloc.add(FetchTableData());
-                  }
-                });
-              },
-              borderRadius: 8,
-              child: Text(
-                'Create Visitor Password ',
-                style: context.textTheme.titleSmall!
-                    .copyWith(color: Colors.white, fontSize: 12),
-              )),
-        ),
-        // Container(
-        //   width: 133,
-        //   height: 42,
-        //   decoration: containerDecoration,
-        //   child: DefaultButton(
-        //       borderRadius: 8,
-        //       backgroundColor: ColorsManager.whiteColors,
-        //       child: Text(
-        //         'Admin Password',
-        //         style: context.textTheme.titleSmall!
-        //             .copyWith(color: Colors.black, fontSize: 12),
-        //       )),
-        // ),
-      ],
-    );
-  }
-
-  Row _buildNormalSearchWidgets(BuildContext context, AccessBloc accessBloc) {
-    // TimeOfDay _selectedTime = TimeOfDay.now();
-
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.end,
-      textBaseline: TextBaseline.ideographic,
-      children: [
-        SizedBox(
-          width: 250,
-          child: CustomWebTextField(
-            controller: accessBloc.passwordName,
-            height: 43,
-            isRequired: false,
-            textFieldName: 'Name',
-            description: '',
-            onSubmitted: (value) {
-              accessBloc.add(FilterDataEvent(
-                  emailAuthorizer:
-                      accessBloc.emailAuthorizer.text.toLowerCase(),
-                  selectedTabIndex:
-                      BlocProvider.of<AccessBloc>(context).selectedIndex,
-                  passwordName: accessBloc.passwordName.text.toLowerCase(),
-                  startTime: accessBloc.effectiveTimeTimeStamp,
-                  endTime: accessBloc.expirationTimeTimeStamp));
-            },
-          ),
-        ),
-        const SizedBox(width: 15),
-        SizedBox(
-          width: 250,
-          child: CustomWebTextField(
-            controller: accessBloc.emailAuthorizer,
-            height: 43,
-            isRequired: false,
-            textFieldName: 'Authorizer',
-            description: '',
-            onSubmitted: (value) {
-              accessBloc.add(FilterDataEvent(
-                  emailAuthorizer:
-                      accessBloc.emailAuthorizer.text.toLowerCase(),
-                  selectedTabIndex:
-                      BlocProvider.of<AccessBloc>(context).selectedIndex,
-                  passwordName: accessBloc.passwordName.text.toLowerCase(),
-                  startTime: accessBloc.effectiveTimeTimeStamp,
-                  endTime: accessBloc.expirationTimeTimeStamp));
-            },
-          ),
-        ),
-        const SizedBox(width: 15),
-        SizedBox(
-          child: DateTimeWebWidget(
-            icon: Assets.calendarIcon,
-            isRequired: false,
-            title: 'Access Time',
-            size: MediaQuery.of(context).size,
-            endTime: () {
-              accessBloc.add(SelectTime(context: context, isStart: false));
-            },
-            startTime: () {
-              accessBloc.add(SelectTime(context: context, isStart: true));
-            },
-            firstString: BlocProvider.of<AccessBloc>(context).startTime,
-            secondString: BlocProvider.of<AccessBloc>(context).endTime,
-          ),
-        ),
-        const SizedBox(width: 15),
-        SearchResetButtons(
-          onSearch: () {
-            accessBloc.add(FilterDataEvent(
-                emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex:
-                    BlocProvider.of<AccessBloc>(context).selectedIndex,
-                passwordName: accessBloc.passwordName.text.toLowerCase(),
-                startTime: accessBloc.effectiveTimeTimeStamp,
-                endTime: accessBloc.expirationTimeTimeStamp));
-          },
-          onReset: () {
-            accessBloc.add(ResetSearch());
-          },
-        ),
-      ],
-    );
-  }
-
-  Widget _buildSmallSearchFilters(BuildContext context, AccessBloc accessBloc) {
-    return Wrap(
-      spacing: 20,
-      runSpacing: 10,
-      children: [
-        SizedBox(
-          width: 300,
-          child: CustomWebTextField(
-              controller: accessBloc.passwordName,
-              isRequired: true,
-              height: 40,
-              textFieldName: 'Name',
-              description: '',
-              onSubmitted: (value) {
-                accessBloc.add(FilterDataEvent(
-                    emailAuthorizer:
-                        accessBloc.emailAuthorizer.text.toLowerCase(),
-                    selectedTabIndex:
-                        BlocProvider.of<AccessBloc>(context).selectedIndex,
-                    passwordName: accessBloc.passwordName.text.toLowerCase(),
-                    startTime: accessBloc.effectiveTimeTimeStamp,
-                    endTime: accessBloc.expirationTimeTimeStamp));
-              }),
-        ),
-        DateTimeWebWidget(
-          icon: Assets.calendarIcon,
-          isRequired: false,
-          title: 'Access Time',
-          size: MediaQuery.of(context).size,
-          endTime: () {
-            accessBloc.add(SelectTime(context: context, isStart: false));
-          },
-          startTime: () {
-            accessBloc.add(SelectTime(context: context, isStart: true));
-          },
-          firstString: BlocProvider.of<AccessBloc>(context).startTime,
-          secondString: BlocProvider.of<AccessBloc>(context).endTime,
-        ),
-        SearchResetButtons(
-          onSearch: () {
-            accessBloc.add(FilterDataEvent(
-                emailAuthorizer: accessBloc.emailAuthorizer.text.toLowerCase(),
-                selectedTabIndex:
-                    BlocProvider.of<AccessBloc>(context).selectedIndex,
-                passwordName: accessBloc.passwordName.text.toLowerCase(),
-                startTime: accessBloc.effectiveTimeTimeStamp,
-                endTime: accessBloc.expirationTimeTimeStamp));
-          },
-          onReset: () {
-            accessBloc.add(ResetSearch());
-          },
-        ),
-      ],
-    );
-  }
-}

lib/pages/analytics/modules/analytics/views/analytics_page.dart

@@ -22,7 +22,9 @@ import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_en
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
 import 'package:syncrow_web/pages/analytics/services/device_location/device_location_details_service_decorator.dart';
 import 'package:syncrow_web/pages/analytics/services/device_location/remote_device_location_service.dart';
+import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/energy_consumption_by_phases_value_divider_decorator.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/remote_energy_consumption_by_phases_service.dart';
+import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/energy_consumption_per_device_value_divider_decorator.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/remote_energy_consumption_per_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/remote_occupancy_heat_map_service.dart';
@@ -62,17 +64,23 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
         ),
         BlocProvider(
           create: (context) => TotalEnergyConsumptionBloc(
-            RemoteTotalEnergyConsumptionService(_httpService),
+            DividedTotalEnergyConsumptionDecorator(
+              RemoteTotalEnergyConsumptionService(_httpService),
+            ),
           ),
         ),
         BlocProvider(
           create: (context) => EnergyConsumptionByPhasesBloc(
-            RemoteEnergyConsumptionByPhasesService(_httpService),
+            EnergyConsumptionByPhasesValueDividerDecorator(
+              RemoteEnergyConsumptionByPhasesService(_httpService),
+            ),
           ),
         ),
         BlocProvider(
           create: (context) => EnergyConsumptionPerDeviceBloc(
-            RemoteEnergyConsumptionPerDeviceService(_httpService),
+            EnergyConsumptionPerDeviceValueDividerDecorator(
+              RemoteEnergyConsumptionPerDeviceService(_httpService),
+            ),
           ),
         ),
         BlocProvider(
@@ -145,6 +153,7 @@ class _AnalyticsPageFormState extends State<AnalyticsPageForm> {
     context.read<SpaceTreeBloc>().add(InitialEvent());
     super.initState();
   }
+
   @override
   Widget build(BuildContext context) {
     return WebScaffold(

lib/pages/analytics/modules/energy_management/widgets/energy_consumption_by_phases_chart.dart

@@ -13,15 +13,15 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
   });
 
   final List<PhasesEnergyConsumption> energyData;
+  static const _kLeftTitlesInterval = 4.0;
 
   @override
   Widget build(BuildContext context) {
     return BarChart(
       BarChartData(
-
         gridData: EnergyManagementChartsHelper.gridData().copyWith(
           checkToShowHorizontalLine: (value) => true,
-          horizontalInterval: 250,
+          horizontalInterval: _kLeftTitlesInterval,
         ),
         borderData: EnergyManagementChartsHelper.borderData(),
         barTouchData: _barTouchData(context),
@@ -100,11 +100,11 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
   }) {
     final data = energyData;
 
-    final date = DateFormat('dd/MM/yyyy').format(data[group.x.toInt()].date);
-    final phaseA = data[group.x.toInt()].energyConsumedA;
-    final phaseB = data[group.x.toInt()].energyConsumedB;
-    final phaseC = data[group.x.toInt()].energyConsumedC;
-    final total = data[group.x.toInt()].energyConsumedKw;
+    final date = DateFormat('dd/MM/yyyy').format(data[group.x].date);
+    final phaseA = data[group.x].energyConsumedA;
+    final phaseB = data[group.x].energyConsumedB;
+    final phaseC = data[group.x].energyConsumedC;
+    final total = data[group.x].energyConsumedKw;
 
     return BarTooltipItem(
       '$date\n',
@@ -149,7 +149,7 @@ class EnergyConsumptionByPhasesChart extends StatelessWidget {
   FlTitlesData _titlesData(BuildContext context) {
     final titlesData = EnergyManagementChartsHelper.titlesData(
       context,
-      leftTitlesInterval: 250,
+      leftTitlesInterval: _kLeftTitlesInterval,
     );
 
     final leftTitles = titlesData.leftTitles.copyWith(

lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart.dart

@@ -7,6 +7,7 @@ class EnergyConsumptionPerDeviceChart extends StatelessWidget {
   const EnergyConsumptionPerDeviceChart({super.key, required this.chartData});
 
   final List<DeviceEnergyDataModel> chartData;
+  static const _kLeftTitlesInterval = 2.5;
 
   @override
   Widget build(BuildContext context) {
@@ -15,12 +16,11 @@ class EnergyConsumptionPerDeviceChart extends StatelessWidget {
         clipData: const FlClipData.vertical(),
         titlesData: EnergyManagementChartsHelper.titlesData(
           context,
-          leftTitlesInterval: 250,
+          leftTitlesInterval: _kLeftTitlesInterval,
         ),
-        
         gridData: EnergyManagementChartsHelper.gridData().copyWith(
           checkToShowHorizontalLine: (value) => true,
-          horizontalInterval: 250,
+          horizontalInterval: _kLeftTitlesInterval,
         ),
         borderData: EnergyManagementChartsHelper.borderData(),
         lineTouchData: EnergyManagementChartsHelper.lineTouchData(),

lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart

@@ -9,22 +9,24 @@ class TotalEnergyConsumptionChart extends StatelessWidget {
 
   final List<EnergyDataModel> chartData;
 
+  static const _leftTitlesInterval = 5.0;
   @override
   Widget build(BuildContext context) {
     return Expanded(
       child: LineChart(
         LineChartData(
-          maxY: chartData.isEmpty
-              ? null
-              : chartData.map((e) => e.value).reduce((a, b) => a > b ? a : b) + 250,
+          maxY: chartData.isNotEmpty
+              ? chartData.map((e) => e.value).reduce((a, b) => a > b ? a : b) +
+                  _leftTitlesInterval
+              : null,
           clipData: const FlClipData.vertical(),
           titlesData: EnergyManagementChartsHelper.titlesData(
             context,
-            leftTitlesInterval: 500,
+            leftTitlesInterval: _leftTitlesInterval,
           ),
           gridData: EnergyManagementChartsHelper.gridData().copyWith(
             checkToShowHorizontalLine: (value) => true,
-            horizontalInterval: 500,
+            horizontalInterval: _leftTitlesInterval,
           ),
           borderData: EnergyManagementChartsHelper.borderData(),
           lineTouchData: EnergyManagementChartsHelper.lineTouchData(),

lib/pages/analytics/services/energy_consumption_by_phases/energy_consumption_by_phases_value_divider_decorator.dart

@@ -0,0 +1,34 @@
+import 'package:syncrow_web/pages/analytics/models/phases_energy_consumption.dart';
+import 'package:syncrow_web/pages/analytics/params/get_energy_consumption_by_phases_param.dart';
+import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/energy_consumption_by_phases_service.dart';
+import 'package:syncrow_web/utils/helpers/safe_division_helper.dart';
+
+class EnergyConsumptionByPhasesValueDividerDecorator
+    implements EnergyConsumptionByPhasesService {
+  const EnergyConsumptionByPhasesValueDividerDecorator(
+    this._decoratee, {
+    this.divider = 100,
+  });
+
+  final EnergyConsumptionByPhasesService _decoratee;
+  final double divider;
+
+  @override
+  Future<List<PhasesEnergyConsumption>> load(
+      GetEnergyConsumptionByPhasesParam param) async {
+    final result = await _decoratee.load(param);
+    return result.map((e) {
+      return PhasesEnergyConsumption(
+        date: e.date,
+        energyConsumedA: SafeDivisionHelper.divide(e.energyConsumedA, divider),
+        energyConsumedB: SafeDivisionHelper.divide(e.energyConsumedB, divider),
+        energyConsumedC: SafeDivisionHelper.divide(e.energyConsumedC, divider),
+        energyConsumedKw: SafeDivisionHelper.divide(e.energyConsumedKw, divider),
+        uuid: e.uuid,
+        createdAt: e.createdAt,
+        updatedAt: e.updatedAt,
+        deviceUuid: e.deviceUuid,
+      );
+    }).toList();
+  }
+}

lib/pages/analytics/services/energy_consumption_per_device/energy_consumption_per_device_value_divider_decorator.dart

@@ -0,0 +1,36 @@
+import 'package:syncrow_web/pages/analytics/models/device_energy_data_model.dart';
+import 'package:syncrow_web/pages/analytics/models/energy_data_model.dart';
+import 'package:syncrow_web/pages/analytics/params/get_energy_consumption_per_device_param.dart';
+import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/energy_consumption_per_device_service.dart';
+import 'package:syncrow_web/utils/helpers/safe_division_helper.dart';
+
+class EnergyConsumptionPerDeviceValueDividerDecorator
+    implements EnergyConsumptionPerDeviceService {
+  const EnergyConsumptionPerDeviceValueDividerDecorator(
+    this._decoratee, {
+    this.divider = 100,
+  });
+
+  final EnergyConsumptionPerDeviceService _decoratee;
+  final double divider;
+
+  @override
+  Future<List<DeviceEnergyDataModel>> load(
+    GetEnergyConsumptionPerDeviceParam param,
+  ) async {
+    final result = await _decoratee.load(param);
+    return result.map((device) {
+      return DeviceEnergyDataModel(
+        deviceId: device.deviceId,
+        deviceName: device.deviceName,
+        color: device.color,
+        energy: device.energy.map((e) {
+          return EnergyDataModel(
+            date: e.date,
+            value: SafeDivisionHelper.divide(e.value, divider),
+          );
+        }).toList(),
+      );
+    }).toList();
+  }
+}

lib/pages/analytics/services/total_energy_consumption/divided_total_energy_consumption_decorator.dart

@@ -0,0 +1,26 @@
+import 'package:syncrow_web/pages/analytics/models/energy_data_model.dart';
+import 'package:syncrow_web/pages/analytics/params/get_total_energy_consumption_param.dart';
+import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/total_energy_consumption_service.dart';
+import 'package:syncrow_web/utils/helpers/safe_division_helper.dart';
+
+class DividedTotalEnergyConsumptionDecorator
+    implements TotalEnergyConsumptionService {
+  const DividedTotalEnergyConsumptionDecorator(
+    this._decoratee, {
+    this.divider = 100,
+  });
+
+  final TotalEnergyConsumptionService _decoratee;
+  final double divider;
+
+  @override
+  Future<List<EnergyDataModel>> load(GetTotalEnergyConsumptionParam param) async {
+    final result = await _decoratee.load(param);
+    return result.map((e) {
+      return EnergyDataModel(
+        date: e.date,
+        value: SafeDivisionHelper.divide(e.value, divider),
+      );
+    }).toList();
+  }
+}

lib/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart

@@ -59,3 +59,23 @@ abstract final class _TotalEnergyConsumptionResponseMapper {
     }).toList();
   }
 }
+
+class DividedTotalEnergyConsumptionDecorator
+    implements TotalEnergyConsumptionService {
+  const DividedTotalEnergyConsumptionDecorator(this._decoratee);
+
+  final TotalEnergyConsumptionService _decoratee;
+  @override
+  Future<List<EnergyDataModel>> load(
+    GetTotalEnergyConsumptionParam param,
+  ) async {
+    final result = await _decoratee.load(param);
+    final dividedResult = result.map((e) {
+      return EnergyDataModel(
+        date: e.date,
+        value: e.value / 100,
+      );
+    });
+    return dividedResult.toList();
+  }
+}

lib/pages/common/custom_table.dart

@@ -50,9 +50,6 @@ class _DynamicTableState extends State<DynamicTable> {
   bool _selectAll = false;
   final ScrollController _verticalScrollController = ScrollController();
   final ScrollController _horizontalScrollController = ScrollController();
-  static const double _fixedRowHeight = 60;
-  static const double _checkboxColumnWidth = 50;
-  static const double _settingsColumnWidth = 100;
 
   @override
   void initState() {
@@ -70,6 +67,7 @@ class _DynamicTableState extends State<DynamicTable> {
 
   bool _compareListOfLists(
       List<List<dynamic>> oldList, List<List<dynamic>> newList) {
+    // Check if the old and new lists are the same
     if (oldList.length != newList.length) return false;
 
     for (int i = 0; i < oldList.length; i++) {
@@ -106,131 +104,73 @@ class _DynamicTableState extends State<DynamicTable> {
     context.read<DeviceManagementBloc>().add(UpdateSelection(_selectedRows));
   }
 
-  double get _totalTableWidth {
-    final hasSettings = widget.headers.contains('Settings');
-    final base = (widget.withCheckBox ? _checkboxColumnWidth : 0) +
-        (hasSettings ? _settingsColumnWidth : 0);
-    final regularCount = widget.headers.length - (hasSettings ? 1 : 0);
-    final regularWidth = (widget.size.width - base) / regularCount;
-    return base + regularCount * regularWidth;
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: widget.size.width,
-      height: widget.size.height,
       decoration: widget.cellDecoration,
-      child: ScrollConfiguration(
-        behavior: const ScrollBehavior().copyWith(scrollbars: false),
+      child: Scrollbar(
+        controller: _verticalScrollController,
+        thumbVisibility: true,
+        trackVisibility: true,
         child: Scrollbar(
+          //fixed the horizontal scrollbar issue
           controller: _horizontalScrollController,
           thumbVisibility: true,
           trackVisibility: true,
-          notificationPredicate: (notif) =>
-              notif.metrics.axis == Axis.horizontal,
+          notificationPredicate: (notif) => notif.depth == 1,
           child: SingleChildScrollView(
-            controller: _horizontalScrollController,
-            scrollDirection: Axis.horizontal,
-            physics:
-                widget.isEmpty ? const NeverScrollableScrollPhysics() : null,
-            child: SizedBox(
-              width: _totalTableWidth,
-              child: Column(
-                children: [
-                  Container(
-                    height: _fixedRowHeight,
-                    decoration: widget.headerDecoration ??
-                        const BoxDecoration(color: ColorsManager.boxColor),
-                    child: Row(
-                      children: [
-                        if (widget.withCheckBox)
-                          _buildSelectAllCheckbox(_checkboxColumnWidth),
-                        for (var i = 0; i < widget.headers.length; i++)
-                          _buildTableHeaderCell(
-                            widget.headers[i],
-                            widget.headers[i] == 'Settings'
-                                ? _settingsColumnWidth
-                                : (_totalTableWidth -
-                                        (widget.withCheckBox
-                                            ? _checkboxColumnWidth
-                                            : 0) -
-                                        (widget.headers.contains('Settings')
-                                            ? _settingsColumnWidth
-                                            : 0)) /
-                                    (widget.headers.length -
-                                        (widget.headers.contains('Settings')
-                                            ? 1
-                                            : 0)),
+            controller: _verticalScrollController,
+            child: SingleChildScrollView(
+              controller: _horizontalScrollController,
+              scrollDirection: Axis.horizontal,
+              child: SizedBox(
+                width: widget.size.width,
+                child: Column(
+                  children: [
+                    Container(
+                      decoration: widget.headerDecoration ??
+                          const BoxDecoration(
+                            color: ColorsManager.boxColor,
                           ),
-                      ],
+                      child: Row(
+                        children: [
+                          if (widget.withCheckBox) _buildSelectAllCheckbox(),
+                          ...List.generate(widget.headers.length, (index) {
+                            return _buildTableHeaderCell(
+                                widget.headers[index], index);
+                          })
+                          //...widget.headers.map((header) => _buildTableHeaderCell(header)),
+                        ],
+                      ),
                     ),
-                  ),
-                  Expanded(
-                    child: widget.isEmpty
-                        ? _buildEmptyState()
-                        : Scrollbar(
-                            controller: _verticalScrollController,
-                            thumbVisibility: true,
-                            trackVisibility: true,
-                            notificationPredicate: (notif) =>
-                                notif.metrics.axis == Axis.vertical,
-                            child: ListView.builder(
-                              controller: _verticalScrollController,
-                              itemCount: widget.data.length,
-                              itemBuilder: (_, rowIndex) {
+                    SizedBox(
+                      width: widget.size.width,
+                      child: widget.isEmpty
+                          ? _buildEmptyState()
+                          : Column(
+                              children:
+                                  List.generate(widget.data.length, (rowIndex) {
                                 final row = widget.data[rowIndex];
-                                return SizedBox(
-                                  height: _fixedRowHeight,
-                                  child: Row(
-                                    children: [
-                                      if (widget.withCheckBox)
-                                        _buildRowCheckbox(
-                                          rowIndex,
-                                          _checkboxColumnWidth,
-                                        ),
-                                      for (var colIndex = 0;
-                                          colIndex < row.length;
-                                          colIndex++)
-                                        widget.headers[colIndex] == 'Settings'
-                                            ? buildSettingsIcon(
-                                                width: _settingsColumnWidth,
-                                                onTap: () => widget
-                                                    .onSettingsPressed
-                                                    ?.call(rowIndex),
-                                              )
-                                            : _buildTableCell(
-                                                row[colIndex].toString(),
-                                                width: widget.headers[
-                                                            colIndex] ==
-                                                        'Settings'
-                                                    ? _settingsColumnWidth
-                                                    : (_totalTableWidth -
-                                                            (widget.withCheckBox
-                                                                ? _checkboxColumnWidth
-                                                                : 0) -
-                                                            (widget.headers
-                                                                    .contains(
-                                                                        'Settings')
-                                                                ? _settingsColumnWidth
-                                                                : 0)) /
-                                                        (widget.headers.length -
-                                                            (widget.headers
-                                                                    .contains(
-                                                                        'Settings')
-                                                                ? 1
-                                                                : 0)),
-                                                rowIndex: rowIndex,
-                                                columnIndex: colIndex,
-                                              ),
-                                    ],
-                                  ),
+                                return Row(
+                                  children: [
+                                    if (widget.withCheckBox)
+                                      _buildRowCheckbox(
+                                          rowIndex, widget.size.height * 0.08),
+                                    ...row.asMap().entries.map((entry) {
+                                      return _buildTableCell(
+                                        entry.value.toString(),
+                                        widget.size.height * 0.08,
+                                        rowIndex: rowIndex,
+                                        columnIndex: entry.key,
+                                      );
+                                    }).toList(),
+                                  ],
                                 );
-                              },
+                              }),
                             ),
-                          ),
-                  ),
-                ],
+                    ),
+                  ],
+                ),
               ),
             ),
           ),
@@ -266,14 +206,13 @@ class _DynamicTableState extends State<DynamicTable> {
                 ),
               ],
             ),
-            SizedBox(height: widget.size.height * 0.2),
+            SizedBox(height: widget.size.height * 0.5),
           ],
         ),
       );
-
-  Widget _buildSelectAllCheckbox(double width) {
+  Widget _buildSelectAllCheckbox() {
     return Container(
-      width: width,
+      width: 50,
       decoration: const BoxDecoration(
         border: Border.symmetric(
           vertical: BorderSide(color: ColorsManager.boxDivider),
@@ -288,11 +227,11 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildRowCheckbox(int index, double width) {
+  Widget _buildRowCheckbox(int index, double size) {
     return Container(
-      width: width,
+      width: 50,
       padding: const EdgeInsets.all(8.0),
-      height: _fixedRowHeight,
+      height: size,
       decoration: const BoxDecoration(
         border: Border(
           bottom: BorderSide(
@@ -314,47 +253,50 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildTableHeaderCell(String title, double width) {
-    return Container(
-      width: width,
-      decoration: const BoxDecoration(
-        border: Border.symmetric(
-          vertical: BorderSide(color: ColorsManager.boxDivider),
-        ),
-      ),
-      constraints: BoxConstraints(minHeight: 40, maxHeight: _fixedRowHeight),
-      alignment: Alignment.centerLeft,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4),
-        child: Text(
-          title,
-          style: context.textTheme.titleSmall!.copyWith(
-            color: ColorsManager.grayColor,
-            fontSize: 12,
-            fontWeight: FontWeight.w400,
+  Widget _buildTableHeaderCell(String title, int index) {
+    return Expanded(
+      child: Container(
+        decoration: const BoxDecoration(
+          border: Border.symmetric(
+            vertical: BorderSide(color: ColorsManager.boxDivider),
+          ),
+        ),
+        constraints: const BoxConstraints.expand(height: 40),
+        alignment: Alignment.centerLeft,
+        child: Padding(
+          padding: EdgeInsets.symmetric(
+              horizontal: index == widget.headers.length - 1 ? 12 : 8.0,
+              vertical: 4),
+          child: Text(
+            title,
+            style: context.textTheme.titleSmall!.copyWith(
+              color: ColorsManager.grayColor,
+              fontSize: 12,
+              fontWeight: FontWeight.w400,
+            ),
+            maxLines: 2,
           ),
-          maxLines: 2,
-          overflow: TextOverflow.ellipsis,
         ),
       ),
     );
   }
 
-  Widget _buildTableCell(String content,
-      {required double width,
-      required int rowIndex,
-      required int columnIndex}) {
+  Widget _buildTableCell(String content, double size,
+      {required int rowIndex, required int columnIndex}) {
     bool isBatteryLevel = content.endsWith('%');
     double? batteryLevel;
 
     if (isBatteryLevel) {
       batteryLevel = double.tryParse(content.replaceAll('%', '').trim());
     }
-
     bool isSettingsColumn = widget.headers[columnIndex] == 'Settings';
     if (isSettingsColumn) {
       return buildSettingsIcon(
-          width: width, onTap: () => widget.onSettingsPressed?.call(rowIndex));
+        width: 120,
+        height: 60,
+        iconSize: 40,
+        onTap: () => widget.onSettingsPressed?.call(rowIndex),
+      );
     }
 
     Color? statusColor;
@@ -378,82 +320,92 @@ class _DynamicTableState extends State<DynamicTable> {
         statusColor = Colors.black;
     }
 
-    return Container(
-      width: width,
-      height: _fixedRowHeight,
-      padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4),
-      decoration: const BoxDecoration(
-        border: Border(
-          bottom: BorderSide(
-            color: ColorsManager.boxDivider,
-            width: 1.0,
+    return Expanded(
+      child: Container(
+        height: size,
+        padding: const EdgeInsets.all(5.0),
+        decoration: const BoxDecoration(
+          border: Border(
+            bottom: BorderSide(
+              color: ColorsManager.boxDivider,
+              width: 1.0,
+            ),
           ),
+          color: Colors.white,
         ),
-        color: Colors.white,
-      ),
-      alignment: Alignment.centerLeft,
-      child: Text(
-        content,
-        style: TextStyle(
-          color: (batteryLevel != null && batteryLevel < 20)
-              ? ColorsManager.red
-              : (batteryLevel != null && batteryLevel > 20)
-                  ? ColorsManager.green
-                  : statusColor,
-          fontSize: 13,
-          fontWeight: FontWeight.w400,
+        alignment: Alignment.centerLeft,
+        child: Text(
+          content,
+          style: TextStyle(
+              color: (batteryLevel != null && batteryLevel < 20)
+                  ? ColorsManager.red
+                  : (batteryLevel != null && batteryLevel > 20)
+                      ? ColorsManager.green
+                      : statusColor,
+              fontSize: 13,
+              fontWeight: FontWeight.w400),
+          maxLines: 2,
         ),
-        maxLines: 2,
-        overflow: TextOverflow.ellipsis,
       ),
     );
   }
 
-  Widget buildSettingsIcon({required double width, VoidCallback? onTap}) {
-    return Container(
-      width: width,
-      height: _fixedRowHeight,
-      padding: const EdgeInsets.only(left: 15, top: 10, bottom: 10),
-      decoration: const BoxDecoration(
-        color: ColorsManager.whiteColors,
-        border: Border(
-          bottom: BorderSide(
-            color: ColorsManager.boxDivider,
-            width: 1.0,
-          ),
-        ),
-      ),
-      child: Align(
-        alignment: Alignment.centerLeft,
-        child: Container(
-          width: 50,
-          decoration: BoxDecoration(
-            color: const Color(0xFFF7F8FA),
-            borderRadius: BorderRadius.circular(20),
-            boxShadow: [
-              BoxShadow(
-                color: Colors.black.withOpacity(0.17),
-                blurRadius: 14,
-                offset: const Offset(0, 4),
+  Widget buildSettingsIcon(
+      {double width = 120,
+      double height = 60,
+      double iconSize = 40,
+      VoidCallback? onTap}) {
+    return Column(
+      children: [
+        Container(
+          padding: const EdgeInsets.only(top: 10, bottom: 15, left: 10),
+          margin: const EdgeInsets.only(right: 15),
+          decoration: const BoxDecoration(
+            color: ColorsManager.whiteColors,
+            border: Border(
+              bottom: BorderSide(
+                color: ColorsManager.boxDivider,
+                width: 1.0,
               ),
-            ],
+            ),
           ),
-          child: InkWell(
-            onTap: onTap,
-            child: Padding(
-              padding: EdgeInsets.all(8.0),
-              child: Center(
-                child: SvgPicture.asset(
-                  Assets.settings,
-                  width: 40,
-                  height: 20,
-                  color: ColorsManager.primaryColor,
+          width: width,
+          child: Padding(
+            padding: const EdgeInsets.only(
+              right: 16.0,
+              left: 17.0,
+            ),
+            child: Container(
+              width: 50,
+              decoration: BoxDecoration(
+                color: const Color(0xFFF7F8FA),
+                borderRadius: BorderRadius.circular(height / 2),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.black.withOpacity(0.17),
+                    blurRadius: 14,
+                    offset: const Offset(0, 4),
+                  ),
+                ],
+              ),
+              child: InkWell(
+                onTap: onTap,
+                child: Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Center(
+                    child: SvgPicture.asset(
+                      Assets.settings,
+                      width: 40,
+                      height: 22,
+                      color: ColorsManager.primaryColor,
+                    ),
+                  ),
                 ),
               ),
             ),
           ),
         ),
-      ),
+      ],
     );
   }
 }

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 (var community in spaceBloc.state.selectedCommunities) {
+        for (final community in spaceBloc.state.selectedCommunities) {
           final spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
-          devices.addAll(await DevicesManagementApi()
-              .fetchDevices(projectUuid, spacesId: spacesList));
+          for (final space in spacesList) {
+            devices.addAll(await DevicesManagementApi()
+                .fetchDevices(community, space, projectUuid));
+          }
         }
       }
 

lib/pages/device_managment/curtain_module/widgets/calibrate_completed_dialog.dart

@@ -17,7 +17,6 @@ class CalibrateCompletedDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
-      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: SizedBox(
         height: 250,

lib/pages/device_managment/schedule_device/schedule_widgets/count_down_button.dart

@@ -29,9 +29,7 @@ class CountdownModeButtons extends StatelessWidget {
       children: [
         Expanded(
           child: DefaultButton(
-            elevation: 2.5,
             height: 40,
-            borderRadius: 8,
             onPressed: () => Navigator.pop(context),
             backgroundColor: ColorsManager.boxColor,
             child: Text('Cancel', style: context.textTheme.bodyMedium),
@@ -41,8 +39,6 @@ class CountdownModeButtons extends StatelessWidget {
         Expanded(
           child: isActive
               ? DefaultButton(
-                  elevation: 2.5,
-                  borderRadius: 8,
                   height: 40,
                   onPressed: () {
                     context.read<ScheduleBloc>().add(
@@ -53,12 +49,10 @@ class CountdownModeButtons extends StatelessWidget {
                           ),
                         );
                   },
-                  backgroundColor: ColorsManager.red100,
+                  backgroundColor: Colors.red,
                   child: const Text('Stop'),
                 )
               : DefaultButton(
-                  elevation: 2.5,
-                  borderRadius: 8,
                   height: 40,
                   onPressed: () {
                     context.read<ScheduleBloc>().add(
@@ -69,7 +63,7 @@ class CountdownModeButtons extends StatelessWidget {
                               countDownCode: countDownCode),
                         );
                   },
-                  backgroundColor: ColorsManager.primaryColorWithOpacity,
+                  backgroundColor: ColorsManager.primaryColor,
                   child: const Text('Save'),
                 ),
         ),

lib/pages/device_managment/schedule_device/schedule_widgets/count_down_inching_view.dart

@@ -226,7 +226,6 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
                     index.toString().padLeft(2, '0'),
                     style: TextStyle(
                       fontSize: 24,
-                      fontWeight: FontWeight.w400,
                       color: isActive ? ColorsManager.grayColor : Colors.black,
                     ),
                   ),
@@ -241,8 +240,7 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
           label,
           style: const TextStyle(
             color: ColorsManager.grayColor,
-            fontSize: 24,
-            fontWeight: FontWeight.w400,
+            fontSize: 18,
           ),
         ),
       ],

lib/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart

@@ -31,11 +31,12 @@ class BuildScheduleView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (_) => ScheduleBloc(deviceId: deviceUuid,)
+      create: (_) => ScheduleBloc(
+        deviceId: deviceUuid,
+      )
         ..add(ScheduleGetEvent(category: category))
         ..add(ScheduleFetchStatusEvent(
-            deviceId: deviceUuid,
-            countdownCode: countdownCode ?? '')),
+            deviceId: deviceUuid, countdownCode: countdownCode ?? '')),
       child: Dialog(
         backgroundColor: Colors.white,
         insetPadding: const EdgeInsets.all(20),
@@ -76,8 +77,7 @@ class BuildScheduleView extends StatelessWidget {
                                         category: category,
                                         time: '',
                                         function: Status(
-                                            code: code.toString(),
-                                            value: true),
+                                            code: code.toString(), value: null),
                                         days: [],
                                       ),
                                       isEdit: false,

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_header.dart

@@ -13,9 +13,9 @@ class ScheduleHeader extends StatelessWidget {
         Text(
           'Scheduling',
           style: TextStyle(
-            color: ColorsManager.primaryColorWithOpacity,
-            fontWeight: FontWeight.w700,
-            fontSize: 30,
+            fontWeight: FontWeight.bold,
+            fontSize: 22,
+            color: ColorsManager.dialogBlueTitle,
           ),
         ),
         Container(

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_managment_ui.dart

@@ -27,7 +27,7 @@ class ScheduleManagementUI extends StatelessWidget {
           width: 170,
           height: 40,
           child: DefaultButton(
-            borderColor: ColorsManager.grayColor.withOpacity(0.5),
+            borderColor: ColorsManager.boxColor,
             padding: 2,
             backgroundColor: ColorsManager.graysColor,
             borderRadius: 15,

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_buttons.dart

@@ -19,8 +19,6 @@ class ScheduleModeButtons extends StatelessWidget {
       children: [
         Expanded(
           child: DefaultButton(
-            elevation: 2.5,
-            borderRadius: 8,
             height: 40,
             onPressed: () {
               Navigator.pop(context);
@@ -35,11 +33,9 @@ class ScheduleModeButtons extends StatelessWidget {
         const SizedBox(width: 20),
         Expanded(
           child: DefaultButton(
-            elevation: 2.5,
-            borderRadius: 8,
             height: 40,
             onPressed: onSave,
-            backgroundColor: ColorsManager.primaryColorWithOpacity,
+            backgroundColor: ColorsManager.primaryColor,
             child: const Text('Save'),
           ),
         ),

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_selector.dart

@@ -35,12 +35,12 @@ class ScheduleModeSelector extends StatelessWidget {
         ),
         const SizedBox(height: 4),
         Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
           children: [
             _buildRadioTile(
                 context, 'Countdown', ScheduleModes.countdown, currentMode),
             _buildRadioTile(
                 context, 'Schedule', ScheduleModes.schedule, currentMode),
-            const Spacer(flex: 1),
             // _buildRadioTile(
             //     context, 'Circulate', ScheduleModes.circulate, currentMode),
             // _buildRadioTile(
@@ -65,7 +65,6 @@ class ScheduleModeSelector extends StatelessWidget {
           style: context.textTheme.bodySmall!.copyWith(
             fontSize: 13,
             color: ColorsManager.blackColor,
-            fontWeight: FontWeight.w400,
           ),
         ),
         leading: Radio<ScheduleModes>(

lib/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_buttons.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 
 class ScheduleDialogHelper {
   static const List<String> allDays = [
@@ -58,9 +56,8 @@ class ScheduleDialogHelper {
                       Text(
                         isEdit ? 'Edit Schedule' : 'Add Schedule',
                         style: Theme.of(context).textTheme.titleLarge!.copyWith(
-                              color: ColorsManager.primaryColorWithOpacity,
-                              fontWeight: FontWeight.w700,
-                              fontSize: 30,
+                              color: Colors.blue,
+                              fontWeight: FontWeight.bold,
                             ),
                       ),
                       const SizedBox(),
@@ -72,9 +69,9 @@ class ScheduleDialogHelper {
                     height: 40,
                     child: ElevatedButton(
                       style: ElevatedButton.styleFrom(
-                        backgroundColor: ColorsManager.boxColor,
+                        backgroundColor: Colors.grey[200],
                         shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(8),
+                          borderRadius: BorderRadius.circular(15),
                         ),
                       ),
                       onPressed: () async {
@@ -113,27 +110,39 @@ class ScheduleDialogHelper {
                 ],
               ),
               actions: [
-                ScheduleModeButtons(
-                  onSave: () {
-                    dynamic temp;
-                    if (deviceType == 'CUR_2') {
-                      temp = functionOn! ? 'open' : 'close';
-                    } else {
-                      temp = functionOn;
-                    }
-                    final entry = ScheduleEntry(
-                      category: schedule?.category ?? 'switch_1',
-                      time: _formatTimeOfDayToISO(selectedTime),
-                      function: Status(
-                        code: code ?? 'switch_1',
-                        value: temp,
-                      ),
-                      days: _convertSelectedDaysToStrings(selectedDays),
-                      scheduleId: schedule.scheduleId,
-                    );
-                    Navigator.pop(ctx, entry);
-                  },
+                SizedBox(
+                  width: 100,
+                  child: OutlinedButton(
+                    onPressed: () {
+                      Navigator.pop(ctx, null);
+                    },
+                    child: const Text('Cancel'),
+                  ),
                 ),
+                SizedBox(
+                    width: 100,
+                    child: ElevatedButton(
+                      onPressed: () {
+                        dynamic temp;
+                        if (deviceType == 'CUR_2') {
+                          temp = functionOn! ? 'open' : 'close';
+                        } else {
+                          temp = functionOn;
+                        }
+                        final entry = ScheduleEntry(
+                          category: schedule?.category ?? 'switch_1',
+                          time: _formatTimeOfDayToISO(selectedTime),
+                          function: Status(
+                            code: code ?? 'switch_1',
+                            value: temp,
+                          ),
+                          days: _convertSelectedDaysToStrings(selectedDays),
+                          scheduleId: schedule.scheduleId,
+                        );
+                        Navigator.pop(ctx, entry);
+                      },
+                      child: const Text('Save'),
+                    )),
               ],
             );
           },

lib/pages/roles_and_permission/model/edit_user_model.dart

@@ -153,7 +153,6 @@ class EditUserModel {
   final String? jobTitle; // can be empty
   final String roleType; // e.g. "ADMIN"
   final List<UserSpaceModel> spaces;
-  final String? companyName;
 
   EditUserModel({
     required this.uuid,
@@ -168,7 +167,6 @@ class EditUserModel {
     required this.jobTitle,
     required this.roleType,
     required this.spaces,
-    this.companyName,
   });
 
   /// Create a [UserData] from JSON data
@@ -184,7 +182,6 @@ class EditUserModel {
       invitedBy: json['invitedBy'] as String,
       phoneNumber: json['phoneNumber'] ?? '',
       jobTitle: json['jobTitle'] ?? '',
-      companyName: json['companyName'] as String?,
       roleType: json['roleType'] as String,
       spaces: (json['spaces'] as List<dynamic>)
           .map((e) => UserSpaceModel.fromJson(e as Map<String, dynamic>))

lib/pages/roles_and_permission/model/roles_user_model.dart

@@ -12,7 +12,7 @@ class RolesUserModel {
   final dynamic jobTitle;
   final dynamic createdDate;
   final dynamic createdTime;
-  final String? companyName;
+
   RolesUserModel({
     required this.uuid,
     required this.createdAt,
@@ -27,7 +27,6 @@ class RolesUserModel {
     this.jobTitle,
     required this.createdDate,
     required this.createdTime,
-    this.companyName,
   });
 
   factory RolesUserModel.fromJson(Map<String, dynamic> json) {
@@ -48,7 +47,6 @@ class RolesUserModel {
           : json['jobTitle'],
       createdDate: json['createdDate'],
       createdTime: json['createdTime'],
-      companyName: json['companyName'] as String?,
     );
   }
 }

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

@@ -52,7 +52,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   final TextEditingController lastNameController = TextEditingController();
   final TextEditingController emailController = TextEditingController();
   final TextEditingController phoneController = TextEditingController();
-  final TextEditingController companyNameController = TextEditingController();
+  final TextEditingController jobTitleController = TextEditingController();
   final TextEditingController roleSearchController = TextEditingController();
 
   bool? isCompleteBasics;
@@ -352,7 +352,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
       bool res = await UserPermissionApi().sendInviteUser(
           email: emailController.text,
           firstName: firstNameController.text,
-          companyName: companyNameController.text,
+          jobTitle: jobTitleController.text,
           lastName: lastNameController.text,
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
@@ -405,7 +405,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
       bool res = await UserPermissionApi().editInviteUser(
           userId: event.userId,
           firstName: firstNameController.text,
-          companyName: companyNameController.text,
+          jobTitle: jobTitleController.text,
           lastName: lastNameController.text,
           phoneNumber: phoneController.text,
           roleUuid: roleSelected,
@@ -455,7 +455,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   Future<void> checkEmail(
       CheckEmailEvent event, Emitter<UsersState> emit) async {
     emit(UsersLoadingState());
-    String? res = await UserPermissionApi().checkEmail(
+    String?  res = await UserPermissionApi().checkEmail(
       emailController.text,
     );
     checkEmailValid = res!;
@@ -529,7 +529,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           lastNameController.text = res.lastName;
           emailController.text = res.email;
           phoneController.text = res.phoneNumber ?? '';
-          companyNameController.text = res.companyName ?? '';
+          jobTitleController.text = res.jobTitle ?? '';
           res.roleType;
           res.spaces.map((space) {
             selectedIds.add(space.uuid);
@@ -645,7 +645,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     lastNameController.dispose();
     emailController.dispose();
     phoneController.dispose();
-    companyNameController.dispose();
+    jobTitleController.dispose();
     roleSearchController.dispose();
     return super.close();
   }

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

@@ -317,7 +317,7 @@ class BasicsView extends StatelessWidget {
                           child: Row(
                         children: [
                           Text(
-                            'Company Name',
+                            'Job Title',
                             style: context.textTheme.bodyMedium?.copyWith(
                               fontWeight: FontWeight.w400,
                               fontSize: 13,
@@ -328,11 +328,11 @@ class BasicsView extends StatelessWidget {
                       Padding(
                         padding: const EdgeInsets.all(8.0),
                         child: TextFormField(
-                          controller: _blocRole.companyNameController,
+                          controller: _blocRole.jobTitleController,
                           style:
                               const TextStyle(color: ColorsManager.blackColor),
                           decoration: inputTextFormDeco(
-                                  hintText: 'Company Name (Optional)')
+                                  hintText: "Job Title (Optional)")
                               .copyWith(
                             hintStyle: context.textTheme.bodyMedium?.copyWith(
                                 fontWeight: FontWeight.w400,

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

@@ -411,7 +411,7 @@ class UsersPage extends StatelessWidget {
                       titles: const [
                         "Full Name",
                         "Email Address",
-                        "Company Name",
+                        "Job Title",
                         "Role",
                         "Creation Date",
                         "Creation Time",
@@ -424,7 +424,7 @@ class UsersPage extends StatelessWidget {
                         return [
                           Text('${user.firstName} ${user.lastName}'),
                           Text(user.email),
-                          Center(child: Text(user.companyName ?? '-')),
+                          Text(user.jobTitle),
                           Text(user.roleType ?? ''),
                           Text(user.createdDate ?? ''),
                           Text(user.createdTime ?? ''),

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

@@ -170,45 +170,45 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
-      LoadScenes event, Emitter<RoutineState> emit) async {
-    emit(state.copyWith(isLoading: true, errorMessage: null));
-    List<ScenesModel> scenes = [];
-    try {
-      BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var createRoutineBloc = context.read<CreateRoutineBloc>();
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      if (createRoutineBloc.selectedSpaceId == '' &&
-          createRoutineBloc.selectedCommunityId == '') {
-        var spaceBloc = context.read<SpaceTreeBloc>();
-        for (var communityId in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList =
-              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-          for (var spaceId in spacesList) {
-            scenes.addAll(
-                await SceneApi.getScenes(spaceId, communityId, projectUuid));
-          }
+Future<void> _onLoadScenes(
+    LoadScenes event, Emitter<RoutineState> emit) async {
+  emit(state.copyWith(isLoading: true, errorMessage: null));
+  List<ScenesModel> scenes = [];
+  try {
+    BuildContext context = NavigationService.navigatorKey.currentContext!;
+    var createRoutineBloc = context.read<CreateRoutineBloc>();
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+    if (createRoutineBloc.selectedSpaceId == '' &&
+        createRoutineBloc.selectedCommunityId == '') {
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        for (var spaceId in spacesList) {
+          scenes.addAll(
+              await SceneApi.getScenes(spaceId, communityId, projectUuid));
         }
-      } else {
-        scenes.addAll(await SceneApi.getScenes(
-            createRoutineBloc.selectedSpaceId,
-            createRoutineBloc.selectedCommunityId,
-            projectUuid));
       }
-
-      emit(state.copyWith(
-        scenes: scenes,
-        isLoading: false,
-      ));
-    } catch (e) {
-      emit(state.copyWith(
-          isLoading: false,
-          loadScenesErrorMessage: 'Failed to load scenes',
-          errorMessage: '',
-          loadAutomationErrorMessage: '',
-          scenes: scenes));
+    } else {
+      scenes.addAll(await SceneApi.getScenes(
+          createRoutineBloc.selectedSpaceId,
+          createRoutineBloc.selectedCommunityId,
+          projectUuid));
     }
+
+    emit(state.copyWith(
+      scenes: scenes,
+      isLoading: false,
+    ));
+  } catch (e) {
+    emit(state.copyWith(
+        isLoading: false,
+        loadScenesErrorMessage: 'Failed to load scenes',
+        errorMessage: '',
+        loadAutomationErrorMessage: '',
+        scenes: scenes));
   }
+} 
 
   Future<void> _onLoadAutomation(
       LoadAutomation event, Emitter<RoutineState> emit) async {
@@ -936,15 +936,16 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         for (var communityId in spaceBloc.state.selectedCommunities) {
           List<String> spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-
-          devices.addAll(await DevicesManagementApi()
-              .fetchDevices(projectUuid, spacesId: spacesList));
+          for (var spaceId in spacesList) {
+            devices.addAll(await DevicesManagementApi()
+                .fetchDevices(communityId, spaceId, projectUuid));
+          }
         }
       } else {
         devices.addAll(await DevicesManagementApi().fetchDevices(
-          projectUuid,
-          spacesId: [createRoutineBloc.selectedSpaceId],
-        ));
+            createRoutineBloc.selectedCommunityId,
+            createRoutineBloc.selectedSpaceId,
+            projectUuid));
       }
 
       emit(state.copyWith(isLoading: false, devices: devices));

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -32,114 +32,113 @@ class SpaceDropdown extends StatelessWidget {
                   color: ColorsManager.blackColor,
                 ),
           ),
-          DropdownButton2<String>(
-            underline: const SizedBox(),
-            buttonStyleData: ButtonStyleData(
-              decoration:
-                  BoxDecoration(borderRadius: BorderRadius.circular(12)),
-            ),
-            value: selectedValue,
-            items: spaces.map((space) {
-              return DropdownMenuItem<String>(
-                value: space.uuid,
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Text(
-                      '   ${space.name}',
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 16,
-                            fontWeight: FontWeight.bold,
-                            color: selectedValue == space.uuid
-                                ? ColorsManager.dialogBlueTitle
-                                : ColorsManager.blackColor,
-                          ),
-                    ),
-                    Text(
-                      '   ${space.lastThreeParents}',
-                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                            fontSize: 12,
-                            color: selectedValue == space.uuid
-                                ? ColorsManager.dialogBlueTitle
-                                : ColorsManager.blackColor,
-                          ),
-                    ),
-                  ],
-                ),
-              );
-            }).toList(),
-            onChanged: onChanged,
-            style: TextStyle(
-              color: Colors.black,
-              fontSize: 13,
-            ),
-            hint: Padding(
-              padding: const EdgeInsets.only(left: 10),
-              child: Text(
-                hintMessage,
-                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                      color: ColorsManager.textGray,
-                    ),
-              ),
-            ),
-            customButton: Container(
+          SizedBox(
+            child: Container(
               height: 40,
-              decoration: BoxDecoration(
-                border: Border.all(color: ColorsManager.textGray, width: 1.0),
-                borderRadius: BorderRadius.circular(10),
-              ),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Expanded(
-                    flex: 8,
-                    child: Padding(
-                      padding: const EdgeInsets.only(left: 10),
-                      child: Text(
-                        selectedValue != null
-                            ? spaces
-                                .firstWhere((e) => e.uuid == selectedValue)
-                                .name
-                            : hintMessage,
-                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                              fontSize: 13,
-                              color: selectedValue != null
-                                  ? Colors.black
-                                  : ColorsManager.textGray,
-                            ),
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                  ),
-                  Expanded(
-                    child: Container(
-                      decoration: BoxDecoration(
-                        color: Colors.grey[200],
-                        borderRadius: const BorderRadius.only(
-                          topRight: Radius.circular(10),
-                          bottomRight: Radius.circular(10),
-                        ),
-                      ),
-                      height: 45,
-                      child: const Icon(
-                        Icons.keyboard_arrow_down,
-                        color: ColorsManager.textGray,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            dropdownStyleData: DropdownStyleData(
-              maxHeight: MediaQuery.of(context).size.height * 0.4,
               decoration: BoxDecoration(
                 color: ColorsManager.whiteColors,
                 borderRadius: BorderRadius.circular(10),
               ),
-            ),
-            menuItemStyleData: const MenuItemStyleData(
-              height: 60,
+              child: DropdownButton2<String>(
+                underline: const SizedBox(),
+                value: selectedValue,
+                items: spaces.map((space) {
+                  return DropdownMenuItem<String>(
+                    value: space.uuid,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Text(
+                          '   ${space.name}',
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                    color: ColorsManager.blackColor,
+                                  ),
+                        ),
+                        Text(
+                          '   ${space.lastThreeParents}',
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                  ),
+                        ),
+                      ],
+                    ),
+                  );
+                }).toList(),
+                onChanged: onChanged,
+                style: TextStyle(color: Colors.black),
+                hint: Padding(
+                  padding: const EdgeInsets.only(left: 10),
+                  child: Text(
+                    hintMessage,
+                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                          color: ColorsManager.textGray,
+                        ),
+                  ),
+                ),
+                customButton: Container(
+                  height: 45,
+                  decoration: BoxDecoration(
+                    border:
+                        Border.all(color: ColorsManager.textGray, width: 1.0),
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Expanded(
+                        flex: 8,
+                        child: Padding(
+                          padding: const EdgeInsets.only(left: 10),
+                          child: Text(
+                            selectedValue != null
+                                ? spaces
+                                    .firstWhere((e) => e.uuid == selectedValue)
+                                    .name
+                                : hintMessage,
+                            style:
+                                Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      color: selectedValue != null
+                                          ? Colors.black
+                                          : ColorsManager.textGray,
+                                    ),
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                      ),
+                      Expanded(
+                        child: Container(
+                          decoration: BoxDecoration(
+                            color: Colors.grey[200],
+                            borderRadius: const BorderRadius.only(
+                              topRight: Radius.circular(10),
+                              bottomRight: Radius.circular(10),
+                            ),
+                          ),
+                          height: 45,
+                          child: const Icon(
+                            Icons.keyboard_arrow_down,
+                            color: ColorsManager.textGray,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                dropdownStyleData: DropdownStyleData(
+                  maxHeight: MediaQuery.of(context).size.height * 0.4,
+                  decoration: BoxDecoration(
+                    color: ColorsManager.whiteColors,
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                ),
+                menuItemStyleData: const MenuItemStyleData(
+                  height: 60,
+                ),
+              ),
             ),
           ),
         ],

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

@@ -121,8 +121,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                 child: SizedBox(
                                   width: 16,
                                   height: 16,
-                                  child:
-                                      CircularProgressIndicator(strokeWidth: 2),
+                                  child: CircularProgressIndicator(strokeWidth: 2),
                                 ),
                               ),
                             )
@@ -160,9 +159,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       height: iconSize,
                                       width: iconSize,
                                       fit: BoxFit.contain,
-                                      errorBuilder:
-                                          (context, error, stackTrace) =>
-                                              Image.asset(
+                                      errorBuilder: (context, error, stackTrace) =>
+                                          Image.asset(
                                         Assets.logo,
                                         height: iconSize,
                                         width: iconSize,
@@ -205,8 +203,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                             maxLines: 1,
                             style: context.textTheme.bodySmall?.copyWith(
                               color: ColorsManager.blackColor,
-                              fontSize:
-                                  widget.isSmallScreenSize(context) ? 10 : 12,
+                              fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
                             ),
                           ),
                           if (widget.spaceName != '')
@@ -225,9 +222,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                   maxLines: 1,
                                   style: context.textTheme.bodySmall?.copyWith(
                                     color: ColorsManager.blackColor,
-                                    fontSize: widget.isSmallScreenSize(context)
-                                        ? 10
-                                        : 12,
+                                    fontSize:
+                                        widget.isSmallScreenSize(context) ? 10 : 12,
                                   ),
                                 ),
                               ],

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

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

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/shared/helpers/space_management_community_dialog_helper.dart

@@ -1,39 +1,24 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:flutter_bloc/flutter_bloc.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/create_community/presentation/create_community_dialog.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/update_community/presentation/edit_community_dialog.dart';
 
 abstract final class SpaceManagementCommunityDialogHelper {
-  static void showCreateDialog(BuildContext context) => showDialog<void>(
-        context: context,
-        builder: (_) => const CreateCommunityDialog(),
-      );
-
-  static void showEditDialog(
-    BuildContext context,
-    CommunityModel community,
-  ) {
+  static void showCreateDialog(BuildContext context) {
     showDialog<void>(
       context: context,
-      builder: (_) => EditCommunityDialog(
-        community: community,
-        parentContext: context,
+      builder: (_) => CreateCommunityDialog(
+        title: const SelectableText('Community Name'),
+        onCreateCommunity: (community) {
+          context.read<CommunitiesBloc>().add(
+                InsertCommunity(community),
+              );
+          context.read<CommunitiesTreeSelectionBloc>().add(
+                SelectCommunityEvent(community: community),
+              );
+        },
       ),
     );
   }
-
-  static void showLoadingDialog(BuildContext context) => showDialog<void>(
-        context: context,
-        barrierDismissible: false,
-        builder: (context) => const Center(
-          child: CircularProgressIndicator(),
-        ),
-      );
-
-  static void showSuccessSnackBar(BuildContext context, String message) =>
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(message),
-        ),
-      );
 }

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

@@ -7,58 +7,25 @@ import 'package:syncrow_web/pages/space_management_v2/modules/communities/data/s
 import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.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/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_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(
-            communitiesBloc: communitiesBloc,
-          ),
-        ),
-        BlocProvider(
-          create: (context) => SpaceDetailsBloc(
-            UniqueSubspacesDecorator(
-              RemoteSpaceDetailsService(httpService: HTTPService()),
+          create: (context) => CommunitiesBloc(
+            communitiesService: DebouncedCommunitiesService(
+              RemoteCommunitiesService(HTTPService()),
             ),
-          ),
-        ),
-        BlocProvider(
-          create: (context) => ProductsBloc(
-            RemoteProductsService(HTTPService()),
-          ),
+          )..add(const LoadCommunities(LoadCommunitiesParam())),
         ),
+        BlocProvider(create: (context) => CommunitiesTreeSelectionBloc()),
       ],
       child: WebScaffold(
         appBarTitle: Text(

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({
@@ -35,9 +31,8 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
   final double _horizontalSpacing = 150.0;
   final double _verticalSpacing = 120.0;
 
-  late final TransformationController _transformationController;
-  late final AnimationController _animationController;
-  SpaceReorderDataModel? _draggedData;
+  late TransformationController _transformationController;
+  late AnimationController _animationController;
 
   @override
   void initState() {
@@ -102,7 +97,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     final position = _positions[space.uuid];
     if (position == null) return;
 
-    const scale = 1;
+    const scale = 1.5;
     final viewSize = context.size;
     if (viewSize == null) return;
 
@@ -117,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,
           ),
         );
@@ -204,8 +182,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     _positions.clear();
     final community = widget.community;
 
-    final levelXOffset = <int, double>{};
-    _calculateLayout(community.spaces, 0, levelXOffset);
+    _calculateLayout(community.spaces, 0, {});
 
     final selectedSpace = widget.selectedSpace;
     final highlightedUuids = <String>{};
@@ -216,24 +193,7 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
 
     final widgets = <Widget>[];
     final connections = <SpaceConnectionModel>[];
-    _generateWidgets(
-      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),
-      ),
-    );
+    _generateWidgets(community.spaces, widgets, connections, highlightedUuids);
 
     return [
       CustomPaint(
@@ -251,178 +211,58 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
     List<SpaceModel> spaces,
     List<Widget> widgets,
     List<SpaceConnectionModel> connections,
-    Set<String> highlightedUuids, {
-    CommunityModel? community,
-    SpaceModel? parent,
-  }) {
-    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];
+    Set<String> highlightedUuids,
+  ) {
+    for (final space in spaces) {
       final position = _positions[space.uuid];
-      if (position == null) {
-        continue;
-      }
+      if (position == null) continue;
 
       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: Tooltip(
-              message: space.spaceName,
-              preferBelow: false,
-              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,
           height: _cardHeight,
-          child: Draggable<SpaceReorderDataModel>(
-            data: reorderData,
-            feedback: Material(
-              color: Colors.transparent,
-              child: Opacity(
-                opacity: 0.2,
-                child: SizedBox(
-                  width: _cardWidth,
-                  height: _cardHeight,
-                  child: spaceCard,
+          child: SpaceCardWidget(
+            buildSpaceContainer: () {
+              return Opacity(
+                opacity: hasNoSelectedSpace || isHighlighted ? 1.0 : 0.5,
+                child: Tooltip(
+                  message: space.spaceName,
+                  preferBelow: false,
+                  child: SpaceCell(
+                    onTap: () => _onSpaceTapped(space),
+                    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,
+              );
+            },
+            onTap: () => SpaceDetailsDialogHelper.showCreate(context),
           ),
         ),
       );
 
-      final targetPos = Offset(
-        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));
-      }
-
-      if (space.children.isNotEmpty) {
-        _generateWidgets(
-          space.children,
-          widgets,
-          connections,
-          highlightedUuids,
-          parent: space,
+        connections.add(
+          SpaceConnectionModel(from: space.uuid, to: child.uuid),
         );
       }
+      _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 InteractiveViewer(
       transformationController: _transformationController,
       boundaryMargin: EdgeInsets.symmetric(
-        horizontal: context.screenWidth * 0.3,
-        vertical: context.screenHeight * 0.3,
+        horizontal: MediaQuery.sizeOf(context).width * 0.3,
+        vertical: MediaQuery.sizeOf(context).height * 0.3,
       ),
       minScale: 0.5,
       maxScale: 3.0,
@@ -430,8 +270,8 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
       child: GestureDetector(
         onTap: _resetSelectionAndZoom,
         child: SizedBox(
-          width: context.screenWidth * 5,
-          height: context.screenHeight * 5,
+          width: MediaQuery.sizeOf(context).width * 5,
+          height: MediaQuery.sizeOf(context).height * 5,
           child: Stack(children: treeWidgets),
         ),
       ),

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

@@ -1,146 +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/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.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/domain/models/space_details_model.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';
-
-class CommunityStructureHeader extends StatelessWidget {
-  const CommunityStructureHeader({super.key});
-
-  List<SpaceModel> _updateRecursive(
-    List<SpaceModel> spaces,
-    SpaceDetailsModel updatedSpace,
-  ) {
-    return spaces.map((space) {
-      if (space.uuid == updatedSpace.uuid) {
-        return space.copyWith(
-          spaceName: updatedSpace.spaceName,
-          icon: updatedSpace.icon,
-        );
-      }
-      if (space.children.isNotEmpty) {
-        return space.copyWith(
-          children: _updateRecursive(space.children, updatedSpace),
-        );
-      }
-      return space;
-    }).toList();
-  }
-
-  @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),
-      decoration: BoxDecoration(
-        color: ColorsManager.whiteColors,
-        boxShadow: [
-          BoxShadow(
-            color: ColorsManager.shadowBlackColor,
-            blurRadius: 8,
-            offset: const Offset(0, 4),
-          ),
-        ],
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Expanded(
-                child: _buildCommunityInfo(context, theme, screenWidth),
-              ),
-              const SizedBox(width: 16),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCommunityInfo(
-      BuildContext context, ThemeData theme, double screenWidth) {
-    final selectedCommunity =
-        context.watch<CommunitiesTreeSelectionBloc>().state.selectedCommunity;
-    final selectedSpace =
-        context.watch<CommunitiesTreeSelectionBloc>().state.selectedSpace;
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Community Structure',
-          style: theme.textTheme.headlineLarge?.copyWith(
-            color: ColorsManager.blackColor,
-          ),
-        ),
-        if (selectedCommunity != null)
-          Row(
-            children: [
-              Expanded(
-                child: Row(
-                  children: [
-                    Flexible(
-                      child: SelectableText(
-                        selectedCommunity.name,
-                        style: theme.textTheme.bodyLarge?.copyWith(
-                          color: ColorsManager.blackColor,
-                        ),
-                        maxLines: 1,
-                      ),
-                    ),
-                    const SizedBox(width: 2),
-                    GestureDetector(
-                      onTap: () {
-                        SpaceManagementCommunityDialogHelper.showEditDialog(
-                          context,
-                          selectedCommunity,
-                        );
-                      },
-                      child: SvgPicture.asset(
-                        Assets.iconEdit,
-                        width: 16,
-                        height: 16,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(width: 8),
-              CommunityStructureHeaderActionButtons(
-                onDelete: (space) {},
-                onDuplicate: (space) {},
-                onEdit: (space) => SpaceDetailsDialogHelper.showEdit(
-                  context,
-                  spaceModel: selectedSpace!,
-                  communityUuid: selectedCommunity.uuid,
-                  onSuccess: (updatedSpaceDetails) {
-                    final communitiesBloc = context.read<CommunitiesBloc>();
-                    final updatedSpaces = _updateRecursive(
-                      selectedCommunity.spaces,
-                      updatedSpaceDetails,
-                    );
-
-                    final community = selectedCommunity.copyWith(
-                      spaces: updatedSpaces,
-                    );
-
-                    communitiesBloc.add(CommunitiesUpdateCommunity(community));
-                  },
-                ),
-                selectedSpace: selectedSpace,
-              ),
-            ],
-          ),
-      ],
-    );
-  }
-}

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

@@ -1,46 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/community_structure_header_button.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-
-class CommunityStructureHeaderActionButtons extends StatelessWidget {
-  const CommunityStructureHeaderActionButtons({
-    super.key,
-    required this.onDelete,
-    required this.selectedSpace,
-    required this.onDuplicate,
-    required this.onEdit,
-  });
-
-  final void Function(SpaceModel space) onDelete;
-  final void Function(SpaceModel space) onDuplicate;
-  final void Function(SpaceModel space) onEdit;
-  final SpaceModel? selectedSpace;
-
-  @override
-  Widget build(BuildContext context) {
-    return Wrap(
-      alignment: WrapAlignment.end,
-      spacing: 10,
-      children: [
-        if (selectedSpace != null) ...[
-          CommunityStructureHeaderButton(
-            label: 'Edit',
-            svgAsset: Assets.editSpace,
-            onPressed: () => onEdit(selectedSpace!),
-          ),
-          CommunityStructureHeaderButton(
-            label: 'Duplicate',
-            svgAsset: Assets.duplicate,
-            onPressed: () => onDuplicate(selectedSpace!),
-          ),
-          CommunityStructureHeaderButton(
-            label: 'Delete',
-            svgAsset: Assets.spaceDelete,
-            onPressed: () => onDelete(selectedSpace!),
-          ),
-        ],
-      ],
-    );
-  }
-}

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

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class CommunityStructureHeaderButton extends StatelessWidget {
-  const CommunityStructureHeaderButton({
-    super.key,
-    required this.label,
-    required this.onPressed,
-    this.svgAsset,
-  });
-
-  final String label;
-  final VoidCallback onPressed;
-  final String? svgAsset;
-
-  @override
-  Widget build(BuildContext context) {
-    const double buttonHeight = 40;
-    return ConstrainedBox(
-      constraints: const BoxConstraints(
-        maxWidth: 130,
-        minHeight: buttonHeight,
-      ),
-      child: DefaultButton(
-        onPressed: onPressed,
-        borderWidth: 2,
-        backgroundColor: ColorsManager.textFieldGreyColor,
-        foregroundColor: ColorsManager.blackColor,
-        borderRadius: 12.0,
-        padding: 2.0,
-        height: buttonHeight,
-        elevation: 0,
-        borderColor: ColorsManager.lightGrayColor,
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            if (svgAsset != null)
-              SvgPicture.asset(
-                svgAsset!,
-                width: 20,
-                height: 20,
-              ),
-            const SizedBox(width: 10),
-            Flexible(
-              child: Text(
-                label,
-                style: context.textTheme.bodySmall
-                    ?.copyWith(color: ColorsManager.blackColor, fontSize: 14),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

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

@@ -2,66 +2,38 @@ 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 {
-  const CreateSpaceButton({
-    required this.communityUuid,
-    super.key,
-  });
-
-  final String communityUuid;
-
-  @override
-  State<CreateSpaceButton> createState() => _CreateSpaceButtonState();
-}
-
-class _CreateSpaceButtonState extends State<CreateSpaceButton> {
-  bool _isHovered = false;
+class CreateSpaceButton extends StatelessWidget {
+  const CreateSpaceButton({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return Tooltip(
-      margin: const EdgeInsets.symmetric(vertical: 24),
-      message: 'Create a new space',
-      child: InkWell(
-        onTap: () => SpaceDetailsDialogHelper.showCreate(
-          context,
-          communityUuid: widget.communityUuid,
+    return GestureDetector(
+      onTap: () => SpaceDetailsDialogHelper.showCreate(context),
+      child: Container(
+        height: 60,
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(20),
+          boxShadow: [
+            BoxShadow(
+              color: Colors.grey.withValues(alpha: 0.5),
+              spreadRadius: 5,
+              blurRadius: 7,
+              offset: const Offset(0, 3),
+            ),
+          ],
         ),
-        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: 90,
-              decoration: BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.circular(20),
-                boxShadow: [
-                  BoxShadow(
-                    color: Colors.grey.withValues(alpha: 0.2),
-                    spreadRadius: 3,
-                    blurRadius: 8,
-                    offset: const Offset(0, 4),
-                  ),
-                ],
-              ),
-              child: Container(
-                margin: const EdgeInsets.symmetric(vertical: 20),
-                decoration: BoxDecoration(
-                  border: Border.all(color: ColorsManager.borderColor, width: 2),
-                  color: ColorsManager.boxColor,
-                  shape: BoxShape.circle,
-                ),
-                child: const Center(
-                  child: Icon(
-                    Icons.add,
-                    color: Colors.blue,
-                  ),
-                ),
-              ),
+        child: Center(
+          child: Container(
+            width: 40,
+            height: 40,
+            decoration: const BoxDecoration(
+              color: ColorsManager.boxColor,
+              shape: BoxShape.circle,
+            ),
+            child: const Icon(
+              Icons.add,
+              color: Colors.blue,
             ),
           ),
         ),

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

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

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

@@ -17,7 +17,7 @@ class SpaceCell extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return InkWell(
+    return GestureDetector(
       onTap: onTap,
       child: Container(
         width: 150,

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

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 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/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
 
@@ -13,29 +12,15 @@ class SpaceManagementCommunityStructure extends StatelessWidget {
     final selectionBloc = context.watch<CommunitiesTreeSelectionBloc>().state;
     final selectedCommunity = selectionBloc.selectedCommunity;
     final selectedSpace = selectionBloc.selectedSpace;
-    const spacer = Spacer(flex: 6);
+    const spacer = Spacer(flex: 10);
     return Visibility(
       visible: selectedCommunity!.spaces.isNotEmpty,
-      replacement: Row(
-        children: [
-          spacer,
-          Expanded(
-            child: CreateSpaceButton(communityUuid: selectedCommunity.uuid),
-          ),
-          spacer
-        ],
+      replacement: const Row(
+        children: [spacer, Expanded(child: CreateSpaceButton()), spacer],
       ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          const CommunityStructureHeader(),
-          Expanded(
-            child: CommunityStructureCanvas(
-              community: selectedCommunity,
-              selectedSpace: selectedSpace,
-            ),
-          ),
-        ],
+      child: CommunityStructureCanvas(
+        community: selectedCommunity,
+        selectedSpace: selectedSpace,
       ),
     );
   }

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

@@ -39,26 +39,6 @@ class CommunityModel extends Equatable {
         .toList();
   }
 
-  CommunityModel copyWith({
-    String? uuid,
-    String? name,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    String? description,
-    String? externalId,
-    List<SpaceModel>? spaces,
-  }) {
-    return CommunityModel(
-      uuid: uuid ?? this.uuid,
-      name: name ?? this.name,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      description: description ?? this.description,
-      externalId: externalId ?? this.externalId,
-      spaces: spaces ?? this.spaces,
-    );
-  }
-
   @override
   List<Object?> get props => [uuid, name, spaces];
 }

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

@@ -19,16 +19,6 @@ class SpaceModel extends Equatable {
     required this.parent,
   });
 
-  factory SpaceModel.empty() => const SpaceModel(
-        uuid: '',
-        createdAt: null,
-        updatedAt: null,
-        spaceName: '',
-        icon: '',
-        children: [],
-        parent: null,
-      );
-
   factory SpaceModel.fromJson(Map<String, dynamic> json) {
     return SpaceModel(
       uuid: json['uuid'] as String? ?? '',
@@ -46,25 +36,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/bloc/communities_bloc.dart

@@ -16,7 +16,6 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
     on<LoadCommunities>(_onLoadCommunities);
     on<LoadMoreCommunities>(_onLoadMoreCommunities);
     on<InsertCommunity>(_onInsertCommunity);
-    on<CommunitiesUpdateCommunity>(_onCommunitiesUpdateCommunity);
   }
 
   final CommunitiesService _communitiesService;
@@ -115,18 +114,4 @@ class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
   ) {
     emit(state.copyWith(communities: [event.community, ...state.communities]));
   }
-
-  void _onCommunitiesUpdateCommunity(
-    CommunitiesUpdateCommunity event,
-    Emitter<CommunitiesState> emit,
-  ) {
-    final updatedCommunities = state.communities
-        .map((e) => e.uuid == event.community.uuid ? event.community : e)
-        .toList();
-    emit(
-      state.copyWith(
-        communities: updatedCommunities,
-      ),
-    );
-  }
 }

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_event.dart

@@ -31,12 +31,3 @@ final class InsertCommunity extends CommunitiesEvent {
   @override
   List<Object?> get props => [community];
 }
-
-final class CommunitiesUpdateCommunity extends CommunitiesEvent {
-  const CommunitiesUpdateCommunity(this.community);
-
-  final CommunityModel community;
-
-  @override
-  List<Object?> get props => [community];
-}

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({
-    required CommunitiesBloc communitiesBloc,
-  })  : _communitiesBloc = communitiesBloc,
-        super(const CommunitiesTreeSelectionState()) {
+  CommunitiesTreeSelectionBloc() : 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/create_community/presentation/create_community_dialog.dart

@@ -1,58 +1,57 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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/shared/widgets/community_dialog.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/communities/domain/models/community_model.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/create_community/data/services/remote_create_community_service.dart';
-import 'package:syncrow_web/pages/space_management_v2/modules/create_community/domain/param/create_community_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/bloc/create_community_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/create_community_dialog_widget.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 
 class CreateCommunityDialog extends StatelessWidget {
-  const CreateCommunityDialog({super.key});
+  final void Function(CommunityModel community) onCreateCommunity;
+  final String? initialName;
+  final Widget title;
+
+  const CreateCommunityDialog({
+    super.key,
+    required this.onCreateCommunity,
+    required this.title,
+    this.initialName,
+  });
 
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (_) => CreateCommunityBloc(
-        RemoteCreateCommunityService(HTTPService()),
-      ),
-      child: BlocConsumer<CreateCommunityBloc, CreateCommunityState>(
+      create: (_) => CreateCommunityBloc(RemoteCreateCommunityService(HTTPService())),
+      child: BlocListener<CreateCommunityBloc, CreateCommunityState>(
         listener: (context, state) {
           switch (state) {
-            case CreateCommunityLoading() || CreateCommunityInitial():
-              SpaceManagementCommunityDialogHelper.showLoadingDialog(context);
+            case CreateCommunityLoading():
+              showDialog<void>(
+                context: context,
+                builder: (context) => const Center(
+                  child: CircularProgressIndicator(),
+                ),
+              );
               break;
             case CreateCommunitySuccess(:final community):
               Navigator.of(context).pop();
               Navigator.of(context).pop();
-              SpaceManagementCommunityDialogHelper.showSuccessSnackBar(
-                context,
-                '${community.name} community created successfully',
+              ScaffoldMessenger.of(context).showSnackBar(
+                const SnackBar(content: Text('Community created successfully')),
               );
-              context.read<CommunitiesBloc>().add(
-                    InsertCommunity(community),
-                  );
-              context.read<CommunitiesTreeSelectionBloc>().add(
-                    SelectCommunityEvent(community: community),
-                  );
+              onCreateCommunity.call(community);
               break;
             case CreateCommunityFailure():
               Navigator.of(context).pop();
               break;
+            default:
+              break;
           }
         },
-        builder: (BuildContext context, CreateCommunityState state) {
-          return CommunityDialog(
-            title: const Text('Create Community'),
-            initialName: null,
-            onSubmit: (name) => context.read<CreateCommunityBloc>().add(
-                  CreateCommunity(CreateCommunityParam(name: name)),
-                ),
-            errorMessage: state is CreateCommunityFailure ? state.message : null,
-          );
-        },
+        child: CreateCommunityDialogWidget(
+          title: title,
+          initialName: initialName,
+        ),
       ),
     );
   }

lib/pages/space_management_v2/modules/create_community/presentation/create_community_dialog_widget.dart

@@ -1,29 +1,28 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/domain/param/create_community_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/bloc/create_community_bloc.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/create_community_name_text_field.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class CommunityDialog extends StatefulWidget {
+class CreateCommunityDialogWidget extends StatefulWidget {
   final String? initialName;
   final Widget title;
-  final void Function(String name) onSubmit;
-  final String? errorMessage;
 
-  const CommunityDialog({
-    required this.title,
-    required this.onSubmit,
-    this.initialName,
-    this.errorMessage,
+  const CreateCommunityDialogWidget({
     super.key,
+    required this.title,
+    this.initialName,
   });
 
   @override
-  State<CommunityDialog> createState() => _CommunityDialogState();
+  State<CreateCommunityDialogWidget> createState() =>
+      _CreateCommunityDialogWidgetState();
 }
 
-class _CommunityDialogState extends State<CommunityDialog> {
+class _CreateCommunityDialogWidgetState extends State<CreateCommunityDialogWidget> {
   late final TextEditingController _nameController;
 
   @override
@@ -64,20 +63,35 @@ class _CommunityDialogState extends State<CommunityDialog> {
         child: Form(
           key: _formKey,
           child: SingleChildScrollView(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                DefaultTextStyle(
-                  style: Theme.of(context).textTheme.headlineMedium!,
-                  child: widget.title,
-                ),
-                const SizedBox(height: 18),
-                CreateCommunityNameTextField(nameController: _nameController),
-                _buildErrorMessage(),
-                const SizedBox(height: 24),
-                _buildActionButtons(context),
-              ],
+            child: BlocBuilder<CreateCommunityBloc, CreateCommunityState>(
+              builder: (context, state) {
+                return Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    DefaultTextStyle(
+                      style: Theme.of(context).textTheme.headlineMedium!,
+                      child: widget.title,
+                    ),
+                    const SizedBox(height: 18),
+                    CreateCommunityNameTextField(
+                      nameController: _nameController,
+                    ),
+                    if (state case CreateCommunityFailure(:final message))
+                      Padding(
+                        padding: const EdgeInsets.only(top: 18),
+                        child: SelectableText(
+                          '* $message',
+                          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                                color: Theme.of(context).colorScheme.error,
+                              ),
+                        ),
+                      ),
+                    const SizedBox(height: 24),
+                    _buildActionButtons(context),
+                  ],
+                );
+              },
             ),
           ),
         ),
@@ -118,22 +132,13 @@ class _CommunityDialogState extends State<CommunityDialog> {
 
   void _onSubmit(BuildContext context) {
     if (_formKey.currentState?.validate() ?? false) {
-      widget.onSubmit.call(_nameController.text.trim());
+      context.read<CreateCommunityBloc>().add(
+            CreateCommunity(
+              CreateCommunityParam(
+                name: _nameController.text.trim(),
+              ),
+            ),
+          );
     }
   }
-
-  Widget _buildErrorMessage() {
-    return Visibility(
-      visible: widget.errorMessage != null,
-      child: Padding(
-        padding: const EdgeInsetsDirectional.symmetric(vertical: 18),
-        child: SelectableText(
-          '* ${widget.errorMessage}',
-          style: context.textTheme.bodyMedium?.copyWith(
-            color: context.theme.colorScheme.error,
-          ),
-        ),
-      ),
-    );
-  }
 }

lib/pages/space_management_v2/modules/products/data/services/remote_products_service.dart

@@ -1,9 +1,9 @@
 import 'package:dio/dio.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/models/product.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/params/load_products_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/services/products_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 RemoteProductsService implements ProductsService {
   const RemoteProductsService(this._httpService);
@@ -13,14 +13,17 @@ class RemoteProductsService implements ProductsService {
   static const _defaultErrorMessage = 'Failed to load devices';
 
   @override
-  Future<List<Product>> getProducts() async {
+  Future<List<Product>> getProducts(LoadProductsParam param) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.listProducts,
+        path: 'devices',
+        queryParameters: {
+          'spaceUuid': param.spaceUuid,
+          if (param.type != null) 'type': param.type,
+          if (param.status != null) 'status': param.status,
+        },
         expectedResponseModel: (data) {
-          final json = data as Map<String, dynamic>;
-          final products = json['data'] as List<dynamic>;
-          return products
+          return (data as List)
               .map((e) => Product.fromJson(e as Map<String, dynamic>))
               .toList();
         },

lib/pages/space_management_v2/modules/products/domain/models/product.dart

@@ -1,24 +1,18 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
 
 class Product extends Equatable {
+  final String uuid;
+  final String name;
+
   const Product({
     required this.uuid,
     required this.name,
-    required this.productType,
   });
 
-  final String uuid;
-  final String name;
-  final String productType;
-
-  String get icon => _mapIconToProduct(productType);
-
   factory Product.fromJson(Map<String, dynamic> json) {
     return Product(
-      uuid: json['uuid'] as String? ?? '',
-      name: json['name'] as String? ?? '',
-      productType: json['prodType'] as String? ?? '',
+      uuid: json['uuid'] as String,
+      name: json['name'] as String,
     );
   }
 
@@ -26,37 +20,9 @@ class Product extends Equatable {
     return {
       'uuid': uuid,
       'name': name,
-      'productType': productType,
     };
   }
 
-  static String _mapIconToProduct(String prodType) {
-    const iconMapping = {
-      '1G': Assets.Gang1SwitchIcon,
-      '1GT': Assets.oneTouchSwitch,
-      '2G': Assets.Gang2SwitchIcon,
-      '2GT': Assets.twoTouchSwitch,
-      '3G': Assets.Gang3SwitchIcon,
-      '3GT': Assets.threeTouchSwitch,
-      'CUR': Assets.curtain,
-      'CUR_2': Assets.curtain,
-      'GD': Assets.garageDoor,
-      'GW': Assets.SmartGatewayIcon,
-      'DL': Assets.DoorLockIcon,
-      'WL': Assets.waterLeakSensor,
-      'WH': Assets.waterHeater,
-      'WM': Assets.waterLeakSensor,
-      'SOS': Assets.sos,
-      'AC': Assets.ac,
-      'CPS': Assets.presenceSensor,
-      'PC': Assets.powerClamp,
-      'WPS': Assets.presenceSensor,
-      'DS': Assets.doorSensor
-    };
-
-    return iconMapping[prodType] ?? Assets.presenceSensor;
-  }
-
   @override
-  List<Object?> get props => [uuid, name, productType];
+  List<Object?> get props => [uuid, name];
 }

lib/pages/space_management_v2/modules/products/domain/params/load_products_param.dart

@@ -0,0 +1,11 @@
+class LoadProductsParam {
+  final String spaceUuid;
+  final String? type;
+  final String? status;
+
+  const LoadProductsParam({
+    required this.spaceUuid,
+    this.type,
+    this.status,
+  });
+}

lib/pages/space_management_v2/modules/products/domain/services/products_service.dart

@@ -1,5 +1,6 @@
 import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/models/product.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/params/load_products_param.dart';
 
 abstract class ProductsService {
-  Future<List<Product>> getProducts();
+  Future<List<Product>> getProducts(LoadProductsParam param);
 }

lib/pages/space_management_v2/modules/products/presentation/bloc/products_bloc.dart

@@ -1,6 +1,7 @@
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/models/product.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/params/load_products_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/services/products_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 
@@ -8,20 +9,20 @@ part 'products_event.dart';
 part 'products_state.dart';
 
 class ProductsBloc extends Bloc<ProductsEvent, ProductsState> {
-  ProductsBloc(this._productsService) : super(ProductsInitial()) {
+  final ProductsService _deviceService;
+
+  ProductsBloc(this._deviceService) : super(ProductsInitial()) {
     on<LoadProducts>(_onLoadProducts);
   }
 
-  final ProductsService _productsService;
-
   Future<void> _onLoadProducts(
     LoadProducts event,
     Emitter<ProductsState> emit,
   ) async {
     emit(ProductsLoading());
     try {
-      final products = await _productsService.getProducts();
-      emit(ProductsLoaded(products));
+      final devices = await _deviceService.getProducts(event.param);
+      emit(ProductsLoaded(devices));
     } on APIException catch (e) {
       emit(ProductsFailure(e.message));
     } catch (e) {

lib/pages/space_management_v2/modules/products/presentation/bloc/products_event.dart

@@ -8,5 +8,10 @@ sealed class ProductsEvent extends Equatable {
 }
 
 final class LoadProducts extends ProductsEvent {
-  const LoadProducts();
+  const LoadProducts(this.param);
+
+  final LoadProductsParam param;
+
+  @override
+  List<Object> get props => [param];
 }

lib/pages/space_management_v2/modules/products/presentation/bloc/products_state.dart

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

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

@@ -1,7 +1,6 @@
 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/space_details/domain/params/load_space_details_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/params/load_spaces_param.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/space_details/domain/services/space_details_service.dart';
 import 'package:syncrow_web/services/api/api_exception.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
@@ -16,15 +15,12 @@ class RemoteSpaceDetailsService implements SpaceDetailsService {
   static const _defaultErrorMessage = 'Failed to load space details';
 
   @override
-  Future<SpaceDetailsModel> getSpaceDetails(LoadSpaceDetailsParam param) async {
+  Future<SpaceDetailsModel> getSpaceDetails(LoadSpacesParam param) async {
     try {
       final response = await _httpService.get(
-        path: await _makeEndpoint(param),
+        path: 'endpoint',
         expectedResponseModel: (data) {
-          final response = data as Map<String, dynamic>;
-          return SpaceDetailsModel.fromJson(
-            response['data'] as Map<String, dynamic>,
-          );
+          return SpaceDetailsModel.fromJson(data as Map<String, dynamic>);
         },
       );
       return response;
@@ -41,13 +37,4 @@ class RemoteSpaceDetailsService implements SpaceDetailsService {
       throw APIException(formattedErrorMessage);
     }
   }
-
-  Future<String> _makeEndpoint(LoadSpaceDetailsParam param) async {
-    final projectUuid = await ProjectManager.getProjectUUID();
-    if (projectUuid == null || projectUuid.isEmpty) {
-      throw APIException('Project UUID is not set');
-    }
-
-    return '/projects/$projectUuid/communities/${param.communityUuid}/spaces/${param.spaceUuid}';
-  }
 }

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

@@ -1,27 +0,0 @@
-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/domain/services/space_details_service.dart';
-
-class UniqueSubspacesDecorator implements SpaceDetailsService {
-  final SpaceDetailsService _decoratee;
-
-  const UniqueSubspacesDecorator(this._decoratee);
-
-  @override
-  Future<SpaceDetailsModel> getSpaceDetails(LoadSpaceDetailsParam param) async {
-    final response = await _decoratee.getSpaceDetails(param);
-
-    final uniqueSubspaces = <String, Subspace>{};
-
-    for (final subspace in response.subspaces) {
-      final normalizedName = subspace.name.trim().toLowerCase();
-      if (!uniqueSubspaces.containsKey(normalizedName)) {
-        uniqueSubspaces[normalizedName] = subspace;
-      }
-    }
-
-    return response.copyWith(
-      subspaces: uniqueSubspaces.values.toList(),
-    );
-  }
-}

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

@@ -1,8 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/products/domain/models/product.dart';
 import 'package:syncrow_web/pages/space_management_v2/modules/tags/domain/models/tag.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:uuid/uuid.dart';
 
 class SpaceDetailsModel extends Equatable {
   final String uuid;
@@ -19,13 +17,6 @@ class SpaceDetailsModel extends Equatable {
     required this.subspaces,
   });
 
-  factory SpaceDetailsModel.empty() => const SpaceDetailsModel(
-        uuid: '',
-        spaceName: '',
-        icon: Assets.location,
-        productAllocations: [],
-        subspaces: [],
-      );
   factory SpaceDetailsModel.fromJson(Map<String, dynamic> json) {
     return SpaceDetailsModel(
       uuid: json['uuid'] as String,
@@ -40,20 +31,14 @@ class SpaceDetailsModel extends Equatable {
     );
   }
 
-  SpaceDetailsModel copyWith({
-    String? uuid,
-    String? spaceName,
-    String? icon,
-    List<ProductAllocation>? productAllocations,
-    List<Subspace>? subspaces,
-  }) {
-    return SpaceDetailsModel(
-      uuid: uuid ?? this.uuid,
-      spaceName: spaceName ?? this.spaceName,
-      icon: icon ?? this.icon,
-      productAllocations: productAllocations ?? this.productAllocations,
-      subspaces: subspaces ?? this.subspaces,
-    );
+  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(),
+    };
   }
 
   @override
@@ -61,38 +46,32 @@ class SpaceDetailsModel extends Equatable {
 }
 
 class ProductAllocation extends Equatable {
-  final String uuid;
   final Product product;
   final Tag tag;
+  final String? location;
 
   const ProductAllocation({
-    required this.uuid,
     required this.product,
     required this.tag,
+    this.location,
   });
 
   factory ProductAllocation.fromJson(Map<String, dynamic> json) {
     return ProductAllocation(
-      uuid: json['uuid'] as String? ?? const Uuid().v4(),
       product: Product.fromJson(json['product'] as Map<String, dynamic>),
       tag: Tag.fromJson(json['tag'] as Map<String, dynamic>),
     );
   }
 
-  ProductAllocation copyWith({
-    String? uuid,
-    Product? product,
-    Tag? tag,
-  }) {
-    return ProductAllocation(
-      uuid: uuid ?? this.uuid,
-      product: product ?? this.product,
-      tag: tag ?? this.tag,
-    );
+  Map<String, dynamic> toJson() {
+    return {
+      'product': product.toJson(),
+      'tag': tag.toJson(),
+    };
   }
 
   @override
-  List<Object?> get props => [uuid, product, tag];
+  List<Object?> get props => [product, tag];
 }
 
 class Subspace extends Equatable {
@@ -109,23 +88,19 @@ class Subspace extends Equatable {
   factory Subspace.fromJson(Map<String, dynamic> json) {
     return Subspace(
       uuid: json['uuid'] as String,
-      name: json['subspaceName'] as String,
+      name: json['name'] as String,
       productAllocations: (json['productAllocations'] as List)
           .map((e) => ProductAllocation.fromJson(e as Map<String, dynamic>))
           .toList(),
     );
   }
 
-  Subspace copyWith({
-    String? uuid,
-    String? name,
-    List<ProductAllocation>? productAllocations,
-  }) {
-    return Subspace(
-      uuid: uuid ?? this.uuid,
-      name: name ?? this.name,
-      productAllocations: productAllocations ?? this.productAllocations,
-    );
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'name': name,
+      'productAllocations': productAllocations.map((e) => e.toJson()).toList(),
+    };
   }
 
   @override

lib/pages/space_management_v2/modules/space_details/domain/params/load_space_details_param.dart

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

lib/pages/space_management_v2/modules/space_details/domain/params/load_spaces_param.dart

@@ -0,0 +1,3 @@
+class LoadSpacesParam {
+  const LoadSpacesParam();
+}