added focused border

added bloc for create community
updated create community dialog to mange edit/create
2025-11-26 17:44:55 +00:00 · 2024-12-04 11:14:02 +04:00 · 2024-12-04 11:05:46 +04:00 · 2024-12-04 10:36:41 +04:00 · 2024-12-03 12:01:17 +03:00 · 2024-12-03 01:04:12 +03:00
66 changed files with 2021 additions and 1101 deletions
--- a/lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart
+++ b/lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart
@ -1,28 +0,0 @@
-import 'dart:async';
-
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-
-part 'switch_tabs_event.dart';
-part 'switch_tabs_state.dart';
-
-class SwitchTabsBloc extends Bloc<SwitchTabsEvent, SwitchTabsState> {
-  SwitchTabsBloc() : super(SwitchTabsInitial()) {
-    on<TriggerSwitchTabsEvent>(_switchTab);
-    on<CreateNewRoutineViewEvent>(_newRoutineView);
-  }
-
-  FutureOr<void> _switchTab(
-    TriggerSwitchTabsEvent event,
-    Emitter<SwitchTabsState> emit,
-  ) {
-    emit(SelectedTabState(event.isRoutineView));
-  }
-
-  FutureOr<void> _newRoutineView(
-    CreateNewRoutineViewEvent event,
-    Emitter<SwitchTabsState> emit,
-  ) {
-    emit(ShowCreateRoutineState(event.showCreateNewRoutineView));
-  }
-}
--- a/lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_event.dart
+++ b/lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_event.dart
@ -1,21 +0,0 @@
-part of 'switch_tabs_bloc.dart';
-
-sealed class SwitchTabsEvent extends Equatable {
-  const SwitchTabsEvent();
-}
-
-class TriggerSwitchTabsEvent extends SwitchTabsEvent {
-  final bool isRoutineView;
-  const TriggerSwitchTabsEvent(this.isRoutineView);
-
-  @override
-  List<Object?> get props => [isRoutineView];
-}
-
-class CreateNewRoutineViewEvent extends SwitchTabsEvent {
-  final bool showCreateNewRoutineView;
-  const CreateNewRoutineViewEvent(this.showCreateNewRoutineView);
-
-  @override
-  List<Object?> get props => [showCreateNewRoutineView];
-}
--- a/lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_state.dart
+++ b/lib/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_state.dart
@ -1,26 +0,0 @@
-part of 'switch_tabs_bloc.dart';
-
-sealed class SwitchTabsState extends Equatable {
-  const SwitchTabsState();
-}
-
-final class SwitchTabsInitial extends SwitchTabsState {
-  @override
-  List<Object> get props => [];
-}
-
-class SelectedTabState extends SwitchTabsState {
-  final bool selectedTab;
-  const SelectedTabState(this.selectedTab);
-
-  @override
-  List<Object?> get props => [selectedTab];
-}
-
-class ShowCreateRoutineState extends SwitchTabsState {
-  final bool showCreateRoutine;
-  const ShowCreateRoutineState(this.showCreateRoutine);
-
-  @override
-  List<Object?> get props => [showCreateRoutine];
-}
--- a/lib/pages/device_managment/all_devices/view/device_managment_page.dart
+++ b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_managment_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routiens/view/routines_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@ -18,10 +18,6 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
  Widget build(BuildContext context) {
    return MultiBlocProvider(
      providers: [
-        BlocProvider(
-          create: (context) =>
-              SwitchTabsBloc()..add(const TriggerSwitchTabsEvent(false)),
-        ),
        BlocProvider(
          create: (context) => DeviceManagementBloc()..add(FetchDevices()),
        ),
@ -33,8 +29,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
            style: Theme.of(context).textTheme.headlineLarge,
          ),
        ),
-        centerBody: BlocBuilder<SwitchTabsBloc, SwitchTabsState>(
-            builder: (context, state) {
+        centerBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
          return Row(
            mainAxisSize: MainAxisSize.min,
            children: [
@ -44,20 +39,14 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                ),
                onPressed: () {
                  context
-                      .read<SwitchTabsBloc>()
-                      .add(const TriggerSwitchTabsEvent(false));
+                      .read<RoutineBloc>()
+                      .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
                },
                child: Text(
                  'Devices',
                  style: context.textTheme.titleMedium?.copyWith(
-                    color:
-                        state is SelectedTabState && state.selectedTab == false
-                            ? ColorsManager.whiteColors
-                            : ColorsManager.grayColor,
-                    fontWeight: (state is SelectedTabState) &&
-                            state.selectedTab == false
-                        ? FontWeight.w700
-                        : FontWeight.w400,
+                    color: !state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
+                    fontWeight: !state.routineTab ? FontWeight.w700 : FontWeight.w400,
                  ),
                ),
              ),
@ -66,21 +55,13 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                  backgroundColor: null,
                ),
                onPressed: () {
-                  context
-                      .read<SwitchTabsBloc>()
-                      .add(const TriggerSwitchTabsEvent(true));
+                  context.read<RoutineBloc>().add(const TriggerSwitchTabsEvent(isRoutineTab: true));
                },
                child: Text(
                  'Routines',
                  style: context.textTheme.titleMedium?.copyWith(
-                    color:
-                        (state is SelectedTabState) && state.selectedTab == true
-                            ? ColorsManager.whiteColors
-                            : ColorsManager.grayColor,
-                    fontWeight:
-                        (state is SelectedTabState) && state.selectedTab == true
-                            ? FontWeight.w700
-                            : FontWeight.w400,
+                    color: state.routineTab ? ColorsManager.whiteColors : ColorsManager.grayColor,
+                    fontWeight: state.routineTab ? FontWeight.w700 : FontWeight.w400,
                  ),
                ),
              ),
@ -88,13 +69,12 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
          );
        }),
        rightBody: const NavigateHomeGridView(),
-        scaffoldBody: BlocBuilder<SwitchTabsBloc, SwitchTabsState>(
-            builder: (context, state) {
-          if (state is SelectedTabState && state.selectedTab) {
+        scaffoldBody: BlocBuilder<RoutineBloc, RoutineState>(builder: (context, state) {
+          if (state.routineTab) {
            return const RoutinesView();
          }
-          if (state is ShowCreateRoutineState && state.showCreateRoutine) {
-            return const CreateNewRoutineView();
+          if (state.createRoutineView) {
+            return CreateNewRoutineView();
          }

          return BlocBuilder<DeviceManagementBloc, DeviceManagementState>(
@ -104,8 +84,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
              } else if (deviceState is DeviceManagementLoaded) {
                return DeviceManagementBody(devices: deviceState.devices);
              } else if (deviceState is DeviceManagementFiltered) {
-                return DeviceManagementBody(
-                    devices: deviceState.filteredDevices);
+                return DeviceManagementBody(devices: deviceState.filteredDevices);
              } else {
                return const Center(child: Text('Error fetching Devices'));
              }
--- a/lib/pages/home/bloc/home_bloc.dart
+++ b/lib/pages/home/bloc/home_bloc.dart
@ -6,6 +6,7 @@ import 'package:syncrow_web/pages/auth/model/user_model.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/home_model/home_item_model.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/services/home_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@ -41,8 +42,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {

  Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
    try {
-      var uuid =
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
      user = await HomeApi().fetchUserInfo(uuid);
      emit(HomeInitial());
    } catch (e) {
@ -84,6 +84,8 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
      icon: Assets.devicesIcon,
      active: true,
      onPress: (context) {
+        BlocProvider.of<RoutineBloc>(context)
+            .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
        context.go(RoutesConst.deviceManagementPage);
      },
      color: ColorsManager.primaryColor,
--- a/lib/pages/routiens/bloc/effective_period/effect_period_bloc.dart
+++ b/lib/pages/routiens/bloc/effective_period/effect_period_bloc.dart
@ -16,6 +16,7 @@ class EffectPeriodBloc extends Bloc<EffectPeriodEvent, EffectPeriodState> {
  };

  EffectPeriodBloc() : super(EffectPeriodState.initial()) {
+    on<InitialEffectPeriodEvent>(_initialEvent);
    on<SetPeriod>(_onSetPeriod);
    on<ToggleDay>(_onToggleDay);
    on<SetCustomTime>(_onSetCustomTime);
@ -24,6 +25,15 @@ class EffectPeriodBloc extends Bloc<EffectPeriodEvent, EffectPeriodState> {
    on<SetDays>(_setAllDays);
  }

+  void _initialEvent(InitialEffectPeriodEvent event, Emitter<EffectPeriodState> emit) {
+    add(SetCustomTime(event.effectiveTime.start, event.effectiveTime.end));
+    emit(state.copyWith(
+      selectedDaysBinary: event.effectiveTime.loops,
+      customStartTime: event.effectiveTime.start,
+      customEndTime: event.effectiveTime.end,
+    ));
+  }
+
  void _onSetPeriod(SetPeriod event, Emitter<EffectPeriodState> emit) {
    String startTime = '';
    String endTime = '';
--- a/lib/pages/routiens/bloc/effective_period/effect_period_event.dart
+++ b/lib/pages/routiens/bloc/effective_period/effect_period_event.dart
@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/utils/constants/app_enum.dart';

 abstract class EffectPeriodEvent extends Equatable {
@ -8,6 +9,15 @@ abstract class EffectPeriodEvent extends Equatable {
  List<Object> get props => [];
 }

+class InitialEffectPeriodEvent extends EffectPeriodEvent {
+  final EffectiveTime effectiveTime;
+
+  const InitialEffectPeriodEvent(this.effectiveTime);
+
+  @override
+  List<Object> get props => [effectiveTime];
+}
+
 class SetPeriod extends EffectPeriodEvent {
  final EnumEffectivePeriodOptions period;

--- a/lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart
--- a/lib/pages/routiens/bloc/routine_bloc/routine_event.dart
+++ b/lib/pages/routiens/bloc/routine_bloc/routine_event.dart
@ -84,8 +84,7 @@ class RemoveDragCard extends RoutineEvent {
  final int index;
  final bool isFromThen;
  final String key;
-  const RemoveDragCard(
-      {required this.index, required this.isFromThen, required this.key});
+  const RemoveDragCard({required this.index, required this.isFromThen, required this.key});
  @override
  List<Object> get props => [index, isFromThen, key];
 }
@ -105,12 +104,10 @@ class EffectiveTimePeriodEvent extends RoutineEvent {
 }

 class CreateAutomationEvent extends RoutineEvent {
-  // final CreateAutomationModel createAutomationModel;
  final String? automationId;
  final bool updateAutomation;

  const CreateAutomationEvent({
-    //required this.createAutomationModel,
    this.automationId,
    this.updateAutomation = false,
  });
@ -159,21 +156,55 @@ class InitializeRoutineState extends RoutineEvent {
 }

 class DeleteScene extends RoutineEvent {
-  final String sceneId;
-  final String unitUuid;
-  const DeleteScene({required this.sceneId, required this.unitUuid});
+  const DeleteScene();
  @override
-  List<Object> get props => [sceneId];
+  List<Object> get props => [];
 }

-class DeleteAutomation extends RoutineEvent {
-  final String automationId;
-  final String unitUuid;
-  const DeleteAutomation({required this.automationId, required this.unitUuid});
+// class DeleteAutomation extends RoutineEvent {
+//   final String automationId;
+//   const DeleteAutomation({required this.automationId});
+//   @override
+//   List<Object> get props => [automationId];
+// }
+
+class UpdateScene extends RoutineEvent {
+  const UpdateScene();
  @override
-  List<Object> get props => [automationId];
+  List<Object> get props => [];
 }

+class UpdateAutomation extends RoutineEvent {
+  const UpdateAutomation();
+  @override
+  List<Object> get props => [];
+}
+
+class SetAutomationActionExecutor extends RoutineEvent {
+  final String automationActionExecutor;
+  const SetAutomationActionExecutor({required this.automationActionExecutor});
+  @override
+  List<Object> get props => [automationActionExecutor];
+}
+
+class TriggerSwitchTabsEvent extends RoutineEvent {
+  final bool isRoutineTab;
+  const TriggerSwitchTabsEvent({required this.isRoutineTab});
+  @override
+  List<Object> get props => [isRoutineTab];
+}
+
+class CreateNewRoutineViewEvent extends RoutineEvent {
+  final bool createRoutineView;
+  const CreateNewRoutineViewEvent({required this.createRoutineView});
+  @override
+  List<Object> get props => [createRoutineView];
+}
+
+class FetchDevicesInRoutine extends RoutineEvent {}
+
 class ResetRoutineState extends RoutineEvent {}

 class ClearFunctions extends RoutineEvent {}
+
+class ResetErrorMessage extends RoutineEvent {}
--- a/lib/pages/routiens/bloc/routine_bloc/routine_state.dart
+++ b/lib/pages/routiens/bloc/routine_bloc/routine_state.dart
@ -21,29 +21,36 @@ class RoutineState extends Equatable {
  final String? sceneId;
  final String? automationId;
  final bool? isUpdate;
+  final List<AllDevicesModel> devices;
+  // final String? automationActionExecutor;
+  final bool routineTab;
+  final bool createRoutineView;

-  const RoutineState({
-    this.ifItems = const [],
-    this.thenItems = const [],
-    this.availableCards = const [],
-    this.scenes = const [],
-    this.automations = const [],
-    this.selectedFunctions = const {},
-    this.isLoading = false,
-    this.errorMessage,
-    this.routineName,
-    this.selectedIcon,
-    this.loadScenesErrorMessage,
-    this.loadAutomationErrorMessage,
-    this.searchText,
-    this.isTabToRun = false,
-    this.isAutomation = false,
-    this.selectedAutomationOperator = 'or',
-    this.effectiveTime,
-    this.sceneId,
-    this.automationId,
-    this.isUpdate,
-  });
+  const RoutineState(
+      {this.ifItems = const [],
+      this.thenItems = const [],
+      this.availableCards = const [],
+      this.scenes = const [],
+      this.automations = const [],
+      this.selectedFunctions = const {},
+      this.isLoading = false,
+      this.errorMessage,
+      this.routineName,
+      this.selectedIcon,
+      this.loadScenesErrorMessage,
+      this.loadAutomationErrorMessage,
+      this.searchText,
+      this.isTabToRun = false,
+      this.isAutomation = false,
+      this.selectedAutomationOperator = 'or',
+      this.effectiveTime,
+      this.sceneId,
+      this.automationId,
+      this.isUpdate,
+      this.devices = const [],
+      //  this.automationActionExecutor,
+      this.routineTab = false,
+      this.createRoutineView = false});

  RoutineState copyWith({
    List<Map<String, dynamic>>? ifItems,
@ -65,31 +72,39 @@ class RoutineState extends Equatable {
    String? sceneId,
    String? automationId,
    bool? isUpdate,
+    List<AllDevicesModel>? devices,
+    //  String? automationActionExecutor,
+    TextEditingController? nameController,
+    bool? routineTab,
+    bool? createRoutineView,
  }) {
    return RoutineState(
-      ifItems: ifItems ?? this.ifItems,
-      thenItems: thenItems ?? this.thenItems,
-      scenes: scenes ?? this.scenes,
-      automations: automations ?? this.automations,
-      selectedFunctions: selectedFunctions ?? this.selectedFunctions,
-      isLoading: isLoading ?? this.isLoading,
-      errorMessage: errorMessage ?? this.errorMessage,
-      routineName: routineName ?? this.routineName,
-      selectedIcon: selectedIcon ?? this.selectedIcon,
-      loadScenesErrorMessage:
-          loadScenesErrorMessage ?? this.loadScenesErrorMessage,
-      loadAutomationErrorMessage:
-          loadAutomationErrorMessage ?? this.loadAutomationErrorMessage,
-      searchText: searchText ?? this.searchText,
-      isTabToRun: isTabToRun ?? this.isTabToRun,
-      isAutomation: isAutomation ?? this.isAutomation,
-      selectedAutomationOperator:
-          selectedAutomationOperator ?? this.selectedAutomationOperator,
-      effectiveTime: effectiveTime ?? this.effectiveTime,
-      sceneId: sceneId ?? this.sceneId,
-      automationId: automationId ?? this.automationId,
-      isUpdate: isUpdate ?? this.isUpdate,
-    );
+        ifItems: ifItems ?? this.ifItems,
+        thenItems: thenItems ?? this.thenItems,
+        scenes: scenes ?? this.scenes,
+        automations: automations ?? this.automations,
+        selectedFunctions: selectedFunctions ?? this.selectedFunctions,
+        isLoading: isLoading ?? this.isLoading,
+        errorMessage: errorMessage ?? this.errorMessage,
+        routineName: routineName ?? this.routineName,
+        selectedIcon: selectedIcon ?? this.selectedIcon,
+        loadScenesErrorMessage:
+            loadScenesErrorMessage ?? this.loadScenesErrorMessage,
+        loadAutomationErrorMessage:
+            loadAutomationErrorMessage ?? this.loadAutomationErrorMessage,
+        searchText: searchText ?? this.searchText,
+        isTabToRun: isTabToRun ?? this.isTabToRun,
+        isAutomation: isAutomation ?? this.isAutomation,
+        selectedAutomationOperator:
+            selectedAutomationOperator ?? this.selectedAutomationOperator,
+        effectiveTime: effectiveTime ?? this.effectiveTime,
+        sceneId: sceneId ?? this.sceneId,
+        automationId: automationId ?? this.automationId,
+        isUpdate: isUpdate ?? this.isUpdate,
+        devices: devices ?? this.devices,
+        //  automationActionExecutor: automationActionExecutor ?? this.automationActionExecutor,
+        routineTab: routineTab ?? this.routineTab,
+        createRoutineView: createRoutineView ?? this.createRoutineView);
  }

  @override
@ -112,6 +127,10 @@ class RoutineState extends Equatable {
        effectiveTime,
        sceneId,
        automationId,
-        isUpdate
+        isUpdate,
+        devices,
+        //   automationActionExecutor,
+        routineTab,
+        createRoutineView
      ];
 }
--- a/lib/pages/routiens/helper/save_routine_helper.dart
+++ b/lib/pages/routiens/helper/save_routine_helper.dart
@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@ -6,10 +8,11 @@ import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/pages/routiens/widgets/dialog_footer.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';

 class SaveRoutineHelper {
-  static Future<bool?> showSaveRoutineDialog(BuildContext context) async {
-    return showDialog<bool?>(
+  static Future<void> showSaveRoutineDialog(BuildContext context) async {
+    return showDialog<void>(
      context: context,
      builder: (BuildContext context) {
        return BlocBuilder<RoutineBloc, RoutineState>(
@ -98,18 +101,29 @@ class SaveRoutineHelper {
                                  final functions =
                                      state.selectedFunctions[item['uniqueCustomId']] ?? [];
                                  return ListTile(
-                                    leading: SvgPicture.asset(
-                                      item['imagePath'],
-                                      width: 22,
-                                      height: 22,
+                                    leading: item['type'] == 'tap_to_run'
+                                        ? Image.memory(
+                                            base64Decode(item['icon']),
+                                            width: 22,
+                                            height: 22,
+                                          )
+                                        : SvgPicture.asset(
+                                            item['imagePath'],
+                                            width: 22,
+                                            height: 22,
+                                          ),
+                                    title: Text(
+                                      item['title'],
+                                      style: context.textTheme.bodySmall?.copyWith(
+                                        fontSize: 14,
+                                        color: ColorsManager.grayColor,
+                                      ),
                                    ),
-                                    title:
-                                        Text(item['title'], style: const TextStyle(fontSize: 14)),
                                    subtitle: Wrap(
                                      children: functions
                                          .map((f) => Text(
                                                '${f.operationName}: ${f.value}, ',
-                                                style: const TextStyle(
+                                                style: context.textTheme.bodySmall?.copyWith(
                                                    color: ColorsManager.grayColor, fontSize: 8),
                                                overflow: TextOverflow.ellipsis,
                                                maxLines: 3,
@ -124,24 +138,33 @@ class SaveRoutineHelper {
                        ],
                      ),
                    ),
-                    if (state.errorMessage != null)
-                      Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: Text(
-                          state.errorMessage!,
-                          style: const TextStyle(color: Colors.red),
-                        ),
-                      ),
+                    // if (state.errorMessage != null || state.errorMessage!.isNotEmpty)
+                    //   Padding(
+                    //     padding: const EdgeInsets.all(8.0),
+                    //     child: Text(
+                    //       state.errorMessage!,
+                    //       style: const TextStyle(color: Colors.red),
+                    //     ),
+                    //   ),
                    DialogFooter(
-                      onCancel: () => Navigator.pop(context, false),
-                      onConfirm: () {
+                      onCancel: () => Navigator.pop(context),
+                      onConfirm: () async {
                        if (state.isAutomation) {
-                          context.read<RoutineBloc>().add(const CreateAutomationEvent());
+                          if (state.isUpdate ?? false) {
+                            context.read<RoutineBloc>().add(const UpdateAutomation());
+                          } else {
+                            context.read<RoutineBloc>().add(const CreateAutomationEvent());
+                          }
                        } else {
-                          context.read<RoutineBloc>().add(const CreateSceneEvent());
+                          if (state.isUpdate ?? false) {
+                            context.read<RoutineBloc>().add(const UpdateScene());
+                          } else {
+                            context.read<RoutineBloc>().add(const CreateSceneEvent());
+                          }
                        }
-
-                        Navigator.pop(context, true);
+                        // if (state.errorMessage == null || state.errorMessage!.isEmpty) {
+                        Navigator.pop(context);
+                        // }
                      },
                      isConfirmEnabled: true,
                    ),
--- a/lib/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart
+++ b/lib/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart
@ -17,7 +17,7 @@ class CreateAutomationModel {
    required this.actions,
  });

-  Map<String, dynamic> toMap() {
+  Map<String, dynamic> toMap([String? automationId]) {
    return {
      'spaceUuid': spaceUuid,
      'automationName': automationName,
@ -41,7 +41,7 @@ class CreateAutomationModel {
    );
  }

-  String toJson() => json.encode(toMap());
+  String toJson(String? automationId) => json.encode(toMap(automationId));

  factory CreateAutomationModel.fromJson(String source) =>
      CreateAutomationModel.fromMap(json.decode(source));
@ -92,7 +92,7 @@ class Condition {
    return {
      'code': code,
      'entityId': entityId,
-      'entityType': entityType,
+      'entityType': 'device_report',
      'expr': expr.toMap(),
    };
  }
@ -137,11 +137,13 @@ class ConditionExpr {

 class AutomationAction {
  String entityId;
+  String? actionType;
  String actionExecutor;
  ExecutorProperty? executorProperty;

  AutomationAction({
    required this.entityId,
+    this.actionType,
    required this.actionExecutor,
    this.executorProperty,
  });
@ -150,12 +152,15 @@ class AutomationAction {
    return {
      'entityId': entityId,
      'actionExecutor': actionExecutor,
-      'executorProperty': executorProperty?.toMap(),
+      if (executorProperty != null)
+        'executorProperty': executorProperty?.toMap(),
+      'actionType': actionType
    };
  }

  factory AutomationAction.fromMap(Map<String, dynamic> map) {
    return AutomationAction(
+      actionType: map['actionType'],
      entityId: map['entityId'] ?? '',
      actionExecutor: map['actionExecutor'] ?? '',
      executorProperty: map['executorProperty'] != null
--- a/lib/pages/routiens/models/create_scene_and_autoamtion/create_scene_model.dart
+++ b/lib/pages/routiens/models/create_scene_and_autoamtion/create_scene_model.dart
@ -95,10 +95,12 @@ class CreateSceneModel {

 class CreateSceneAction {
  String entityId;
+  String? actionType;
  String actionExecutor;
  CreateSceneExecutorProperty? executorProperty;

  CreateSceneAction({
+    this.actionType,
    required this.entityId,
    required this.actionExecutor,
    required this.executorProperty,
@ -110,6 +112,7 @@ class CreateSceneAction {
    CreateSceneExecutorProperty? executorProperty,
  }) {
    return CreateSceneAction(
+      actionType: actionType ?? this.actionType,
      entityId: entityId ?? this.entityId,
      actionExecutor: actionExecutor ?? this.actionExecutor,
      executorProperty: executorProperty ?? this.executorProperty,
@ -125,6 +128,7 @@ class CreateSceneAction {
      };
    } else {
      return {
+        "actionType": actionType,
        'entityId': entityId,
        'actionExecutor': actionExecutor,
      };
@ -133,6 +137,7 @@ class CreateSceneAction {

  factory CreateSceneAction.fromMap(Map<String, dynamic> map) {
    return CreateSceneAction(
+      actionType: map['actionType'],
      entityId: map['entityId'] ?? '',
      actionExecutor: map['actionExecutor'] ?? '',
      executorProperty:
--- a/lib/pages/routiens/models/routine_details_model.dart
+++ b/lib/pages/routiens/models/routine_details_model.dart
@ -13,6 +13,8 @@ class RoutineDetailsModel {
  final EffectiveTime? effectiveTime;
  final List<RoutineCondition>? conditions;
  final String? type;
+  final String? sceneId;
+  final String? automationId;

  RoutineDetailsModel({
    required this.spaceUuid,
@ -24,6 +26,8 @@ class RoutineDetailsModel {
    this.effectiveTime,
    this.conditions,
    this.type,
+    this.sceneId,
+    this.automationId,
  });

  // Convert to CreateSceneModel
@ -57,12 +61,14 @@ class RoutineDetailsModel {
      'name': name,
      'decisionExpr': decisionExpr,
      'actions': actions.map((x) => x.toMap()).toList(),
-      if (iconId != null) 'iconId': iconId,
+      if (iconId != null) 'iconUuid': iconId,
      if (showInDevice != null) 'showInDevice': showInDevice,
      if (effectiveTime != null) 'effectiveTime': effectiveTime!.toMap(),
      if (conditions != null)
        'conditions': conditions!.map((x) => x.toMap()).toList(),
      if (type != null) 'type': type,
+      if (sceneId != null) 'sceneId': sceneId,
+      if (automationId != null) 'automationId': automationId,
    };
  }

@ -74,7 +80,7 @@ class RoutineDetailsModel {
      actions: List<RoutineAction>.from(
        map['actions']?.map((x) => RoutineAction.fromMap(x)) ?? [],
      ),
-      iconId: map['iconId'],
+      iconId: map['iconUuid'],
      showInDevice: map['showInDevice'],
      effectiveTime: map['effectiveTime'] != null
          ? EffectiveTime.fromMap(map['effectiveTime'])
@ -84,6 +90,8 @@ class RoutineDetailsModel {
              map['conditions'].map((x) => RoutineCondition.fromMap(x)))
          : null,
      type: map['type'],
+      sceneId: map['sceneId'],
+      automationId: map['automationId'],
    );
  }

@ -96,12 +104,18 @@ class RoutineDetailsModel {
 class RoutineAction {
  final String entityId;
  final String actionExecutor;
+  final String? name;
  final RoutineExecutorProperty? executorProperty;
+  final String productType;
+  final String? type;

  RoutineAction({
    required this.entityId,
    required this.actionExecutor,
+    required this.productType,
    this.executorProperty,
+    this.name,
+    this.type,
  });

  CreateSceneAction toCreateSceneAction() {
@ -124,6 +138,8 @@ class RoutineAction {
    return {
      'entityId': entityId,
      'actionExecutor': actionExecutor,
+      if (type != null) 'type': type,
+      if (name != null) 'name': name,
      if (executorProperty != null)
        'executorProperty': executorProperty!.toMap(),
    };
@ -133,6 +149,9 @@ class RoutineAction {
    return RoutineAction(
      entityId: map['entityId'] ?? '',
      actionExecutor: map['actionExecutor'] ?? '',
+      productType: map['productType'] ?? '',
+      name: map['name'] ?? '',
+      type: map['type'] ?? '',
      executorProperty: map['executorProperty'] != null
          ? RoutineExecutorProperty.fromMap(map['executorProperty'])
          : null,
@ -189,12 +208,14 @@ class RoutineCondition {
  final String entityId;
  final String entityType;
  final RoutineConditionExpr expr;
+  final String productType;

  RoutineCondition({
    required this.code,
    required this.entityId,
    required this.entityType,
    required this.expr,
+    required this.productType,
  });

  Condition toCondition() {
@ -221,6 +242,7 @@ class RoutineCondition {
      entityId: map['entityId'] ?? '',
      entityType: map['entityType'] ?? '',
      expr: RoutineConditionExpr.fromMap(map['expr']),
+      productType: map['productType'] ?? '',
    );
  }
 }
--- a/lib/pages/routiens/view/create_new_routine_view.dart
+++ b/lib/pages/routiens/view/create_new_routine_view.dart
@ -16,6 +16,7 @@ class CreateNewRoutineView extends StatelessWidget {
    this.routineId,
    this.isScene = true,
  });
+
  @override
  Widget build(BuildContext context) {
    return Container(
@ -67,7 +68,7 @@ class CreateNewRoutineView extends StatelessWidget {
                        width: double.infinity,
                        color: ColorsManager.dialogBlueTitle,
                      ),
-
+    
                      /// THEN Container
                      Expanded(
                        child: Card(
--- a/lib/pages/routiens/view/routines_view.dart
+++ b/lib/pages/routiens/view/routines_view.dart
@ -1,20 +1,30 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/fetch_routine_scenes_automation.dart';
 import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/routine_view_card.dart';
 import 'package:syncrow_web/utils/color_manager.dart';

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

+  @override
+  State<RoutinesView> createState() => _RoutinesViewState();
+}
+
+class _RoutinesViewState extends State<RoutinesView> {
+  @override
+  void initState() {
+    super.initState();
+    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+  }
+
  @override
  Widget build(BuildContext context) {
-    return BlocBuilder<SwitchTabsBloc, SwitchTabsState>(
+    return BlocBuilder<RoutineBloc, RoutineState>(
      builder: (context, state) {
-        if (state is ShowCreateRoutineState && state.showCreateRoutine) {
+        if (state.createRoutineView) {
          return const CreateNewRoutineView();
        }
        return Padding(
@ -36,12 +46,12 @@ class RoutinesView extends StatelessWidget {
              ),
              RoutineViewCard(
                onTap: () {
-                  BlocProvider.of<SwitchTabsBloc>(context).add(
-                    const CreateNewRoutineViewEvent(true),
-                  );
                  context.read<RoutineBloc>().add(
                        (ResetRoutineState()),
                      );
+                  BlocProvider.of<RoutineBloc>(context).add(
+                    const CreateNewRoutineViewEvent(createRoutineView: true),
+                  );
                },
                icon: Icons.add,
                textString: '',
--- a/lib/pages/routiens/widgets/delete_scene.dart
+++ b/lib/pages/routiens/widgets/delete_scene.dart
@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/custom_dialog.dart';
+import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class DeleteSceneWidget extends StatelessWidget {
+  const DeleteSceneWidget({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        const SizedBox(
+          height: 10,
+        ),
+        GestureDetector(
+          onTap: () async {
+            await showCustomDialog(
+                context: context,
+                message: 'Are you sure you want to delete this scene?',
+                actions: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      InkWell(
+                        onTap: () {
+                          Navigator.of(context).pop();
+                        },
+                        child: Container(
+                          alignment: AlignmentDirectional.center,
+                          child: Text(
+                            'Cancel',
+                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                  color: ColorsManager.textGray,
+                                ),
+                          ),
+                        ),
+                      ),
+                      Container(width: 1, height: 50, color: ColorsManager.greyColor),
+                      InkWell(
+                        onTap: () {
+                          context.read<RoutineBloc>().add(const DeleteScene());
+                          Navigator.of(context).pop();
+                          Navigator.of(context).pop();
+                        },
+                        child: Container(
+                          alignment: AlignmentDirectional.center,
+                          child: Text(
+                            'Confirm',
+                            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                  color: ColorsManager.primaryColorWithOpacity,
+                                ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ]);
+          },
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const Icon(
+                Icons.delete,
+                color: ColorsManager.red,
+              ),
+              const SizedBox(
+                width: 2,
+              ),
+              Text(
+                'Delete',
+                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                      color: ColorsManager.red,
+                    ),
+              ),
+            ],
+          ),
+        ),
+        const SizedBox(
+          height: 10,
+        ),
+      ],
+    );
+  }
+}
--- a/lib/pages/routiens/widgets/dragable_card.dart
+++ b/lib/pages/routiens/widgets/dragable_card.dart
@ -35,6 +35,20 @@ class DraggableCard extends StatelessWidget {
        final deviceFunctions =
            state.selectedFunctions[deviceData['uniqueCustomId']] ?? [];

+        int index = state.thenItems.indexWhere(
+            (item) => item['uniqueCustomId'] == deviceData['uniqueCustomId']);
+
+        if (index != -1) {
+          return _buildCardContent(context, deviceFunctions, padding: padding);
+        }
+
+        int ifIndex = state.ifItems.indexWhere(
+            (item) => item['uniqueCustomId'] == deviceData['uniqueCustomId']);
+
+        if (ifIndex != -1) {
+          return _buildCardContent(context, deviceFunctions, padding: padding);
+        }
+
        return Draggable<Map<String, dynamic>>(
          data: deviceData,
          feedback: Transform.rotate(
@ -79,19 +93,19 @@ class DraggableCard extends StatelessWidget {
                        ),
                      ),
                      padding: const EdgeInsets.all(8),
-                      child: imagePath.contains('.svg')
-                          ? SvgPicture.asset(
-                              imagePath,
+                      child: deviceData['type'] == 'tap_to_run'
+                          ? Image.memory(
+                              base64Decode(deviceData['icon']),
                            )
-                          : Image.memory(
-                              base64Decode(imagePath),
+                          : SvgPicture.asset(
+                              imagePath,
                            ),
                    ),
                    const SizedBox(height: 8),
                    Padding(
                      padding: const EdgeInsets.symmetric(horizontal: 3),
                      child: Text(
-                        title,
+                        deviceData['title'] ?? deviceData['name'] ?? title,
                        textAlign: TextAlign.center,
                        overflow: TextOverflow.ellipsis,
                        maxLines: 2,
@ -104,7 +118,6 @@ class DraggableCard extends StatelessWidget {
                  ],
                ),
                if (deviceFunctions.isNotEmpty)
-                  // const Divider(height: 1),
                  ...deviceFunctions.map((function) => Row(
                        mainAxisSize: MainAxisSize.min,
                        children: [
--- a/lib/pages/routiens/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routiens/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@ -11,8 +11,7 @@ class FetchRoutineScenesAutomation extends StatefulWidget {
  const FetchRoutineScenesAutomation({super.key});

  @override
-  State<FetchRoutineScenesAutomation> createState() =>
-      _FetchRoutineScenesState();
+  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
 }

 class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
@ -67,49 +66,23 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                              padding: EdgeInsets.only(
                                right: isSmallScreenSize(context) ? 4.0 : 8.0,
                              ),
-                              child: Stack(
-                                children: [
-                                  RoutineViewCard(
-                                    onTap: () {},
-                                    textString: state.scenes[index].name,
-                                    icon: state.scenes[index].icon ??
-                                        Assets.logoHorizontal,
-                                    isFromScenes: true,
-                                    iconInBytes:
-                                        state.scenes[index].iconInBytes,
-                                  ),
-                                  Positioned(
-                                    top: 0,
-                                    right: 0,
-                                    child: InkWell(
-                                      onTap: () => context
-                                          .read<RoutineBloc>()
-                                          .add(
-                                            DeleteScene(
-                                              sceneId: state.scenes[index].id,
-                                              unitUuid: spaceId,
-                                            ),
-                                          ),
-                                      child: Container(
-                                        height: 20,
-                                        width: 20,
-                                        decoration: BoxDecoration(
-                                          color: ColorsManager.whiteColors,
-                                          shape: BoxShape.circle,
-                                          border: Border.all(
-                                            color: ColorsManager.grayColor,
-                                            width: 2.0,
-                                          ),
+                              child: RoutineViewCard(
+                                onTap: () {
+                                  BlocProvider.of<RoutineBloc>(context).add(
+                                    const CreateNewRoutineViewEvent(createRoutineView: true),
+                                  );
+                                  context.read<RoutineBloc>().add(
+                                        GetSceneDetails(
+                                          sceneId: state.scenes[index].id,
+                                          isTabToRun: true,
+                                          isUpdate: true,
                                        ),
-                                        child: const Center(
-                                          child: Icon(Icons.delete,
-                                              size: 15,
-                                              color: ColorsManager.grayColor),
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                ],
+                                      );
+                                },
+                                textString: state.scenes[index].name,
+                                icon: state.scenes[index].icon ?? Assets.logoHorizontal,
+                                isFromScenes: true,
+                                iconInBytes: state.scenes[index].iconInBytes,
                              ),
                            ),
                          ),
@ -142,46 +115,20 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                              padding: EdgeInsets.only(
                                right: isSmallScreenSize(context) ? 4.0 : 8.0,
                              ),
-                              child: Stack(
-                                children: [
-                                  RoutineViewCard(
-                                    onTap: () {},
-                                    textString: state.automations[index].name,
-                                    icon: state.automations[index].icon ??
-                                        Assets.automation,
-                                  ),
-                                  Positioned(
-                                    top: 0,
-                                    right: 0,
-                                    child: InkWell(
-                                      onTap: () =>
-                                          context.read<RoutineBloc>().add(
-                                                DeleteAutomation(
-                                                  automationId: state
-                                                      .automations[index].id,
-                                                  unitUuid: spaceId,
-                                                ),
-                                              ),
-                                      child: Container(
-                                        height: 20,
-                                        width: 20,
-                                        decoration: BoxDecoration(
-                                          color: ColorsManager.whiteColors,
-                                          shape: BoxShape.circle,
-                                          border: Border.all(
-                                            color: ColorsManager.grayColor,
-                                            width: 2.0,
-                                          ),
-                                        ),
-                                        child: const Center(
-                                          child: Icon(Icons.delete,
-                                              size: 15,
-                                              color: ColorsManager.grayColor),
-                                        ),
-                                      ),
-                                    ),
-                                  ),
-                                ],
+                              child: RoutineViewCard(
+                                onTap: () {
+                                  BlocProvider.of<RoutineBloc>(context).add(
+                                    const CreateNewRoutineViewEvent(createRoutineView: true),
+                                  );
+                                  context.read<RoutineBloc>().add(
+                                        GetAutomationDetails(
+                                            automationId: state.automations[index].id,
+                                            isAutomation: true,
+                                            isUpdate: true),
+                                      );
+                                },
+                                textString: state.automations[index].name,
+                                icon: state.automations[index].icon ?? Assets.automation,
                              ),
                            ),
                          ),
--- a/lib/pages/routiens/widgets/routine_devices.dart
+++ b/lib/pages/routiens/widgets/routine_devices.dart
@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/widgets/dragable_card.dart';
@ -10,68 +9,67 @@ class RoutineDevices extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (context) => DeviceManagementBloc()..add(FetchDevices()),
-      child: BlocBuilder<DeviceManagementBloc, DeviceManagementState>(
-        builder: (context, state) {
-          if (state is DeviceManagementLoaded) {
-            List<AllDevicesModel> deviceList = state.devices
-                .where((device) =>
-                    device.productType == 'AC' ||
-                    device.productType == '1G' ||
-                    device.productType == '2G' ||
-                    device.productType == '3G')
-                .toList();
-
-            // Provide the RoutineBloc to the child widgets
-            return BlocBuilder<RoutineBloc, RoutineState>(
-              builder: (context, routineState) {
-                return Wrap(
-                  spacing: 10,
-                  runSpacing: 10,
-                  children: deviceList.asMap().entries.map((entry) {
-                    final device = entry.value;
-                    if (routineState.searchText != null && routineState.searchText!.isNotEmpty) {
-                      return device.name!
-                              .toLowerCase()
-                              .contains(routineState.searchText!.toLowerCase())
-                          ? DraggableCard(
-                              imagePath: device.getDefaultIcon(device.productType),
-                              title: device.name ?? '',
-                              deviceData: {
-                                'device': device,
-                                'imagePath': device.getDefaultIcon(device.productType),
-                                'title': device.name ?? '',
-                                'deviceId': device.uuid,
-                                'productType': device.productType,
-                                'functions': device.functions,
-                                'uniqueCustomId': '',
-                              },
-                            )
-                          : Container();
-                    } else {
-                      return DraggableCard(
-                        imagePath: device.getDefaultIcon(device.productType),
-                        title: device.name ?? '',
-                        deviceData: {
-                          'device': device,
-                          'imagePath': device.getDefaultIcon(device.productType),
-                          'title': device.name ?? '',
-                          'deviceId': device.uuid,
-                          'productType': device.productType,
-                          'functions': device.functions,
-                          'uniqueCustomId': '',
-                        },
-                      );
-                    }
-                  }).toList(),
-                );
-              },
-            );
-          }
+    return BlocBuilder<RoutineBloc, RoutineState>(
+      builder: (context, state) {
+        if (state.isLoading) {
          return const Center(child: CircularProgressIndicator());
-        },
-      ),
+        }
+
+        Future.delayed(const Duration(seconds: 1), () {
+          if (state.devices.isEmpty) {
+            return const Center(child: Text('No devices found'));
+          }
+        });
+
+        List<AllDevicesModel> deviceList = state.devices
+            .where((device) =>
+                device.productType == 'AC' ||
+                device.productType == '1G' ||
+                device.productType == '2G' ||
+                device.productType == '3G')
+            .toList();
+
+        return Wrap(
+          spacing: 10,
+          runSpacing: 10,
+          children: deviceList.asMap().entries.map((entry) {
+            final device = entry.value;
+            if (state.searchText != null && state.searchText!.isNotEmpty) {
+              return device.name!
+                      .toLowerCase()
+                      .contains(state.searchText!.toLowerCase())
+                  ? DraggableCard(
+                      imagePath: device.getDefaultIcon(device.productType),
+                      title: device.name ?? '',
+                      deviceData: {
+                        'device': device,
+                        'imagePath': device.getDefaultIcon(device.productType),
+                        'title': device.name ?? '',
+                        'deviceId': device.uuid,
+                        'productType': device.productType,
+                        'functions': device.functions,
+                        'uniqueCustomId': '',
+                      },
+                    )
+                  : Container();
+            } else {
+              return DraggableCard(
+                imagePath: device.getDefaultIcon(device.productType),
+                title: device.name ?? '',
+                deviceData: {
+                  'device': device,
+                  'imagePath': device.getDefaultIcon(device.productType),
+                  'title': device.name ?? '',
+                  'deviceId': device.uuid,
+                  'productType': device.productType,
+                  'functions': device.functions,
+                  'uniqueCustomId': '',
+                },
+              );
+            }
+          }).toList(),
+        );
+      },
    );
  }
 }
--- a/lib/pages/routiens/widgets/routine_dialogs/automation_dialog.dart
+++ b/lib/pages/routiens/widgets/routine_dialogs/automation_dialog.dart
@ -11,20 +11,36 @@ class AutomationDialog extends StatefulWidget {
  final String automationName;
  final String automationId;
  final String uniqueCustomId;
+  final String? passedAutomationActionExecutor;

  const AutomationDialog({
    super.key,
    required this.automationName,
    required this.automationId,
    required this.uniqueCustomId,
+    this.passedAutomationActionExecutor,
  });

  @override
-  _AutomationDialogState createState() => _AutomationDialogState();
+  State<AutomationDialog> createState() => _AutomationDialogState();
 }

 class _AutomationDialogState extends State<AutomationDialog> {
-  bool _isEnabled = true;
+  String? selectedAutomationActionExecutor;
+
+  @override
+  void initState() {
+    super.initState();
+    List<DeviceFunctionData>? functions = context
+        .read<RoutineBloc>()
+        .state
+        .selectedFunctions[widget.uniqueCustomId];
+    for (DeviceFunctionData data in functions ?? []) {
+      if (data.entityId == widget.automationId) {
+        selectedAutomationActionExecutor = data.value;
+      }
+    }
+  }

  @override
  Widget build(BuildContext context) {
@ -41,26 +57,25 @@ class _AutomationDialogState extends State<AutomationDialog> {
            ListTile(
              leading: SvgPicture.asset(Assets.acPower, width: 24, height: 24),
              title: const Text('Enable'),
-              trailing: Radio<bool>(
-                value: true,
-                groupValue: _isEnabled,
-                onChanged: (bool? value) {
-                  setState(() {
-                    _isEnabled = value!;
-                  });
-                },
-              ),
+              trailing: Radio<String?>(
+                  value: 'rule_enable',
+                  groupValue: selectedAutomationActionExecutor,
+                  onChanged: (String? value) {
+                    setState(() {
+                      selectedAutomationActionExecutor = 'rule_enable';
+                    });
+                  }),
            ),
            ListTile(
              leading:
                  SvgPicture.asset(Assets.acPowerOff, width: 24, height: 24),
              title: const Text('Disable'),
-              trailing: Radio<bool>(
-                value: false,
-                groupValue: _isEnabled,
-                onChanged: (bool? value) {
+              trailing: Radio<String?>(
+                value: 'rule_disable',
+                groupValue: selectedAutomationActionExecutor,
+                onChanged: (String? value) {
                  setState(() {
-                    _isEnabled = value!;
+                    selectedAutomationActionExecutor = 'rule_disable';
                  });
                },
              ),
@ -68,23 +83,25 @@ class _AutomationDialogState extends State<AutomationDialog> {
            const SizedBox(height: 16),
            DialogFooter(
              onConfirm: () {
-                context.read<RoutineBloc>().add(
-                      AddFunctionToRoutine(
-                        [
-                          DeviceFunctionData(
-                            entityId: widget.automationId,
-                            functionCode: 'automation',
-                            value: _isEnabled ? 'rule_enable' : 'rule_disable',
-                            operationName: 'Automation',
-                          ),
-                        ],
-                        widget.uniqueCustomId,
-                      ),
-                    );
+                if (selectedAutomationActionExecutor != null) {
+                  context.read<RoutineBloc>().add(
+                        AddFunctionToRoutine(
+                          [
+                            DeviceFunctionData(
+                              entityId: widget.automationId,
+                              functionCode: 'automation',
+                              value: selectedAutomationActionExecutor,
+                              operationName: 'Automation',
+                            ),
+                          ],
+                          widget.uniqueCustomId,
+                        ),
+                      );
+                }
                Navigator.of(context).pop(true);
              },
-              onCancel: () => Navigator.of(context).pop(false),
-              isConfirmEnabled: true,
+              onCancel: () => Navigator.of(context).pop(),
+              isConfirmEnabled: selectedAutomationActionExecutor != null,
              dialogWidth: 400,
            ),
          ],
--- a/lib/pages/routiens/widgets/routine_dialogs/discard_dialog.dart
+++ b/lib/pages/routiens/widgets/routine_dialogs/discard_dialog.dart
@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@ -49,11 +48,11 @@ class DiscardDialog {
        onConfirm: () {
          context.read<RoutineBloc>().add(ResetRoutineState());
          Navigator.pop(context);
-          BlocProvider.of<SwitchTabsBloc>(context).add(
-            const CreateNewRoutineViewEvent(false),
+          BlocProvider.of<RoutineBloc>(context).add(
+            const CreateNewRoutineViewEvent(createRoutineView: false),
          );
-          BlocProvider.of<SwitchTabsBloc>(context).add(
-            const TriggerSwitchTabsEvent(true),
+          BlocProvider.of<RoutineBloc>(context).add(
+            const TriggerSwitchTabsEvent(isRoutineTab: true),
          );
        });
  }
--- a/lib/pages/routiens/widgets/routine_dialogs/setting_dialog.dart
+++ b/lib/pages/routiens/widgets/routine_dialogs/setting_dialog.dart
@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_bloc.dart';
+import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_event.dart';
 import 'package:syncrow_web/pages/routiens/bloc/effective_period/effect_period_state.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/setting_bloc/setting_bloc.dart';
@ -9,6 +10,7 @@ import 'package:syncrow_web/pages/routiens/bloc/setting_bloc/setting_state.dart'
 import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/pages/routiens/models/icon_model.dart';
 import 'package:syncrow_web/pages/routiens/view/effective_period_view.dart';
+import 'package:syncrow_web/pages/routiens/widgets/delete_scene.dart';
 import 'package:syncrow_web/pages/routiens/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:flutter/cupertino.dart';
@ -22,11 +24,18 @@ class SettingHelper {
      context: context,
      builder: (BuildContext context) {
        final isAutomation = context.read<RoutineBloc>().state.isAutomation;
+        final effectiveTime = context.read<RoutineBloc>().state.effectiveTime;
+
        return MultiBlocProvider(
          providers: [
-            BlocProvider(
-              create: (_) => EffectPeriodBloc(),
-            ),
+            if (effectiveTime != null)
+              BlocProvider(
+                create: (_) => EffectPeriodBloc()..add(InitialEffectPeriodEvent(effectiveTime)),
+              ),
+            if (effectiveTime == null)
+              BlocProvider(
+                create: (_) => EffectPeriodBloc(),
+              ),
            BlocProvider(
                create: (_) => SettingBloc()..add(InitialEvent(selectedIcon: iconId ?? ''))),
          ],
@ -44,7 +53,7 @@ class SettingHelper {
                  }
                  return Container(
                    width: context.read<SettingBloc>().isExpanded ? 800 : 400,
-                    height: context.read<SettingBloc>().isExpanded && isAutomation ? 500 : 300,
+                    height: context.read<SettingBloc>().isExpanded && isAutomation ? 500 : 350,
                    decoration: BoxDecoration(
                      color: Colors.white,
                      borderRadius: BorderRadius.circular(20),
@ -167,6 +176,9 @@ class SettingHelper {
                                                                fontSize: 14)),
                                                  ],
                                                ),
+                                                if (context.read<RoutineBloc>().state.isUpdate ??
+                                                    false)
+                                                  const DeleteSceneWidget()
                                              ],
                                            )),
                                      ],
@ -284,6 +296,9 @@ class SettingHelper {
                                                                fontSize: 14)),
                                                  ],
                                                ),
+                                                if (context.read<RoutineBloc>().state.isUpdate ??
+                                                    false)
+                                                  const DeleteSceneWidget()
                                              ],
                                            )),
                                      ],
--- a/lib/pages/routiens/widgets/routine_search_and_buttons.dart
+++ b/lib/pages/routiens/widgets/routine_search_and_buttons.dart
@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/helper/save_routine_helper.dart';
 import 'package:syncrow_web/pages/routiens/widgets/routine_dialogs/discard_dialog.dart';
@ -10,20 +9,47 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';

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

+  @override
+  State<RoutineSearchAndButtons> createState() => _RoutineSearchAndButtonsState();
+}
+
+class _RoutineSearchAndButtonsState extends State<RoutineSearchAndButtons> {
+  late TextEditingController _nameController;
+
+  @override
+  void initState() {
+    super.initState();
+    _nameController = TextEditingController();
+  }
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    super.dispose();
+  }
+
  @override
  Widget build(BuildContext context) {
    return BlocBuilder<RoutineBloc, RoutineState>(
      builder: (context, state) {
+        _nameController.text = state.routineName ?? '';
        return LayoutBuilder(
          builder: (BuildContext context, BoxConstraints constraints) {
            return Wrap(
              runSpacing: 16,
              children: [
+                Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Text(
+                    state.errorMessage ?? '',
+                    style: const TextStyle(color: Colors.red),
+                  ),
+                ),
                Row(
                  crossAxisAlignment: CrossAxisAlignment.end,
                  children: [
@ -37,24 +63,6 @@ class RoutineSearchAndButtons extends StatelessWidget {
                            constraints: BoxConstraints(
                                maxWidth:
                                    constraints.maxWidth > 700 ? 450 : constraints.maxWidth - 32),
-                            // child: StatefulTextField(
-                            //   title: 'Routine Name',
-                            //   initialValue: state.routineName ?? '',
-                            //   height: 40,
-                            //   // controller: TextEditingController(),
-                            //   hintText: 'Please enter the name',
-                            //   boxDecoration: containerWhiteDecoration,
-                            //   elevation: 0,
-                            //   borderRadius: 15,
-                            //   isRequired: true,
-                            //   width: 450,
-                            //   onSubmitted: (value) {
-                            //     // context.read<RoutineBloc>().add(SetRoutineName(value));
-                            //   },
-                            //   onChanged: (value) {
-                            //     context.read<RoutineBloc>().add(SetRoutineName(value));
-                            //   },
-                            // ),
                            child: Column(
                              mainAxisAlignment: MainAxisAlignment.start,
                              crossAxisAlignment: CrossAxisAlignment.start,
@ -81,7 +89,7 @@ class RoutineSearchAndButtons extends StatelessWidget {
                                  child: TextFormField(
                                    style: context.textTheme.bodyMedium!
                                        .copyWith(color: ColorsManager.blackColor),
-                                    initialValue: state.routineName,
+                                    controller: _nameController,
                                    decoration: InputDecoration(
                                      hintText: 'Please enter the name',
                                      hintStyle: context.textTheme.bodyMedium!
@ -90,8 +98,10 @@ class RoutineSearchAndButtons extends StatelessWidget {
                                          const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
                                      border: InputBorder.none,
                                    ),
-                                    onChanged: (value) {
-                                      context.read<RoutineBloc>().add(SetRoutineName(value));
+                                    onTapOutside: (_) {
+                                      context
+                                          .read<RoutineBloc>()
+                                          .add(SetRoutineName(_nameController.text));
                                    },
                                    validator: (value) {
                                      if (value == null || value.isEmpty) {
@ -115,6 +125,7 @@ class RoutineSearchAndButtons extends StatelessWidget {
                                          ? () async {
                                              final result = await SettingHelper.showSettingDialog(
                                                context: context,
+                                                iconId: state.selectedIcon ?? '',
                                              );
                                              if (result != null) {
                                                context
@ -208,16 +219,18 @@ class RoutineSearchAndButtons extends StatelessWidget {
                                    );
                                    return;
                                  }
-                                  final result =
-                                      await SaveRoutineHelper.showSaveRoutineDialog(context);
-                                  if (result != null && result) {
-                                    BlocProvider.of<SwitchTabsBloc>(context).add(
-                                      const CreateNewRoutineViewEvent(false),
-                                    );
-                                    BlocProvider.of<SwitchTabsBloc>(context).add(
-                                      const TriggerSwitchTabsEvent(true),
-                                    );
-                                  }
+                                  // final result =
+                                  // await
+                                  BlocProvider.of<RoutineBloc>(context).add(ResetErrorMessage());
+                                  SaveRoutineHelper.showSaveRoutineDialog(context);
+                                  // if (result != null && result) {
+                                  //   BlocProvider.of<RoutineBloc>(context).add(
+                                  //     const CreateNewRoutineViewEvent(createRoutineView: false),
+                                  //   );
+                                  //   BlocProvider.of<RoutineBloc>(context).add(
+                                  //     const TriggerSwitchTabsEvent(isRoutineTab: true),
+                                  //   );
+                                  // }
                                },
                                borderRadius: 15,
                                elevation: 0,
@ -249,8 +262,7 @@ class RoutineSearchAndButtons extends StatelessWidget {
                            onPressed: state.isAutomation || state.isTabToRun
                                ? () async {
                                    final result = await SettingHelper.showSettingDialog(
-                                      context: context,
-                                    );
+                                        context: context, iconId: state.selectedIcon ?? '');
                                    if (result != null) {
                                      context.read<RoutineBloc>().add(AddSelectedIcon(result));
                                    }
@ -301,7 +313,7 @@ class RoutineSearchAndButtons extends StatelessWidget {
                        width: 200,
                        child: Center(
                          child: DefaultButton(
-                            onPressed: () {
+                            onPressed: () async {
                              if (state.routineName == null || state.routineName!.isEmpty) {
                                ScaffoldMessenger.of(context).showSnackBar(
                                  SnackBar(
@ -335,7 +347,18 @@ class RoutineSearchAndButtons extends StatelessWidget {
                                );
                                return;
                              }
+                              // final result =
+                              // await
+                              BlocProvider.of<RoutineBloc>(context).add(ResetErrorMessage());
                              SaveRoutineHelper.showSaveRoutineDialog(context);
+                              // if (result != null && result) {
+                              //   BlocProvider.of<RoutineBloc>(context).add(
+                              //     const CreateNewRoutineViewEvent(createRoutineView: false),
+                              //   );
+                              //   BlocProvider.of<RoutineBloc>(context).add(
+                              //     const TriggerSwitchTabsEvent(isRoutineTab: true),
+                              //   );
+                              // }
                            },
                            borderRadius: 15,
                            elevation: 0,
--- a/lib/pages/routiens/widgets/then_container.dart
+++ b/lib/pages/routiens/widgets/then_container.dart
@ -30,69 +30,112 @@ class ThenContainer extends StatelessWidget {
                        style: TextStyle(
                            fontSize: 18, fontWeight: FontWeight.bold)),
                    const SizedBox(height: 16),
-                    Wrap(
-                        spacing: 8,
-                        runSpacing: 8,
-                        children: List.generate(
-                            state.thenItems.length,
-                            (index) => GestureDetector(
-                                  onTap: () async {
-                                    if (state.thenItems[index]['deviceId'] ==
-                                        'delay') {
-                                      final result = await DelayHelper
-                                          .showDelayPickerDialog(
-                                              context, state.thenItems[index]);
+                    state.isLoading && state.isUpdate == true
+                        ? const Center(
+                            child: CircularProgressIndicator(),
+                          )
+                        : Wrap(
+                            spacing: 8,
+                            runSpacing: 8,
+                            children: List.generate(
+                                state.thenItems.length,
+                                (index) => GestureDetector(
+                                      onTap: () async {
+                                        if (state.thenItems[index]
+                                                ['deviceId'] ==
+                                            'delay') {
+                                          final result = await DelayHelper
+                                              .showDelayPickerDialog(context,
+                                                  state.thenItems[index]);

-                                      if (result != null) {
-                                        context
-                                            .read<RoutineBloc>()
-                                            .add(AddToThenContainer({
-                                              ...state.thenItems[index],
-                                              'imagePath': Assets.delay,
-                                              'title': 'Delay',
-                                            }));
-                                      }
-                                      return;
-                                    }
+                                          if (result != null) {
+                                            context
+                                                .read<RoutineBloc>()
+                                                .add(AddToThenContainer({
+                                                  ...state.thenItems[index],
+                                                  'imagePath': Assets.delay,
+                                                  'title': 'Delay',
+                                                }));
+                                          }
+                                          return;
+                                        }

-                                    final result = await DeviceDialogHelper
-                                        .showDeviceDialog(
-                                            context, state.thenItems[index],
-                                            removeComparetors: true);
+                                        if (state.thenItems[index]['type'] ==
+                                            'automation') {
+                                          final result = await showDialog<bool>(
+                                            context: context,
+                                            builder: (BuildContext context) =>
+                                                AutomationDialog(
+                                              automationName:
+                                                  state.thenItems[index]
+                                                          ['name'] ??
+                                                      'Automation',
+                                              automationId:
+                                                  state.thenItems[index]
+                                                          ['deviceId'] ??
+                                                      '',
+                                              uniqueCustomId:
+                                                  state.thenItems[index]
+                                                      ['uniqueCustomId'],
+                                            ),
+                                          );

-                                    if (result != null) {
-                                      context.read<RoutineBloc>().add(
-                                          AddToThenContainer(
-                                              state.thenItems[index]));
-                                    } else if (!['AC', '1G', '2G', '3G']
-                                        .contains(state.thenItems[index]
-                                            ['productType'])) {
-                                      context.read<RoutineBloc>().add(
-                                          AddToThenContainer(
-                                              state.thenItems[index]));
-                                    }
-                                  },
-                                  child: DraggableCard(
-                                    imagePath: state.thenItems[index]
-                                            ['imagePath'] ??
-                                        '',
-                                    title:
-                                        state.thenItems[index]['title'] ?? '',
-                                    deviceData: state.thenItems[index],
-                                    padding: const EdgeInsets.symmetric(
-                                        horizontal: 4, vertical: 8),
-                                    isFromThen: true,
-                                    isFromIf: false,
-                                    onRemove: () {
-                                      context.read<RoutineBloc>().add(
-                                          RemoveDragCard(
-                                              index: index,
-                                              isFromThen: true,
-                                              key: state.thenItems[index]
-                                                  ['uniqueCustomId']));
-                                    },
-                                  ),
-                                ))),
+                                          if (result != null) {
+                                            context
+                                                .read<RoutineBloc>()
+                                                .add(AddToThenContainer({
+                                                  ...state.thenItems[index],
+                                                  'imagePath':
+                                                      Assets.automation,
+                                                  'title':
+                                                      state.thenItems[index]
+                                                              ['name'] ??
+                                                          state.thenItems[index]
+                                                              ['title'],
+                                                }));
+                                          }
+                                          return;
+                                        }
+
+                                        final result = await DeviceDialogHelper
+                                            .showDeviceDialog(
+                                                context, state.thenItems[index],
+                                                removeComparetors: true);
+
+                                        if (result != null) {
+                                          context.read<RoutineBloc>().add(
+                                              AddToThenContainer(
+                                                  state.thenItems[index]));
+                                        } else if (!['AC', '1G', '2G', '3G']
+                                            .contains(state.thenItems[index]
+                                                ['productType'])) {
+                                          context.read<RoutineBloc>().add(
+                                              AddToThenContainer(
+                                                  state.thenItems[index]));
+                                        }
+                                      },
+                                      child: DraggableCard(
+                                        imagePath: state.thenItems[index]
+                                                ['imagePath'] ??
+                                            '',
+                                        title: state.thenItems[index]
+                                                ['title'] ??
+                                            '',
+                                        deviceData: state.thenItems[index],
+                                        padding: const EdgeInsets.symmetric(
+                                            horizontal: 4, vertical: 8),
+                                        isFromThen: true,
+                                        isFromIf: false,
+                                        onRemove: () {
+                                          context.read<RoutineBloc>().add(
+                                              RemoveDragCard(
+                                                  index: index,
+                                                  isFromThen: true,
+                                                  key: state.thenItems[index]
+                                                      ['uniqueCustomId']));
+                                        },
+                                      ),
+                                    ))),
                  ],
                ),
              ),
@ -109,6 +152,12 @@ class ThenContainer extends StatelessWidget {
            }

            if (mutableData['type'] == 'automation') {
+              int index = state.thenItems.indexWhere(
+                  (item) => item['deviceId'] == mutableData['deviceId']);
+              if (index != -1) {
+                return;
+              }
+
              final result = await showDialog<bool>(
                context: context,
                builder: (BuildContext context) => AutomationDialog(
@ -129,9 +178,14 @@ class ThenContainer extends StatelessWidget {
            }

            if (mutableData['type'] == 'tap_to_run' && state.isAutomation) {
+              int index = state.thenItems.indexWhere(
+                  (item) => item['deviceId'] == mutableData['deviceId']);
+              if (index != -1) {
+                return;
+              }
              context.read<RoutineBloc>().add(AddToThenContainer({
                    ...mutableData,
-                    'imagePath': Assets.logo,
+                    'imagePath': mutableData['imagePath'] ?? Assets.logo,
                    'title': mutableData['name'],
                  }));

--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@ -1,9 +1,9 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_state.dart';
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';

--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart
@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart'; // Import for Offset
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart'; // Import for Offset

 abstract class SpaceManagementEvent extends Equatable {
  const SpaceManagementEvent();
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_state.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_state.dart
@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';

 abstract class SpaceManagementState extends Equatable {
  const SpaceManagementState();
--- a/lib/pages/spaces_management/all_spaces/model/community_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/community_model.dart
@ -1,5 +1,5 @@
 import 'package:syncrow_web/pages/auth/model/region_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';

 class CommunityModel {
  final String uuid;
--- a/lib/pages/spaces_management/all_spaces/model/connection_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/connection_model.dart
@ -1,4 +1,4 @@
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';

 class Connection {
  final SpaceModel startSpace;
--- a/lib/pages/spaces_management/all_spaces/model/product_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/product_model.dart
--- a/lib/pages/spaces_management/all_spaces/model/selected_product_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/selected_product_model.dart
--- a/lib/pages/spaces_management/all_spaces/model/space_data_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/space_data_model.dart
--- a/lib/pages/spaces_management/all_spaces/model/space_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/space_model.dart
@ -1,7 +1,7 @@
 import 'dart:ui';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:uuid/uuid.dart';

--- a/lib/pages/spaces_management/all_spaces/model/space_response_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/space_response_model.dart
--- a/lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart
+++ b/lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart
@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_state.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/loaded_space_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart';
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
--- a/lib/pages/spaces_management/all_spaces/widgets/add_device_type_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/add_device_type_widget.dart
@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/counter_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/counter_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
--- a/lib/pages/spaces_management/all_spaces/widgets/blank_community_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/blank_community_widget.dart
@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/create_community_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';

 class BlankCommunityWidget extends StatefulWidget {
@ -72,7 +72,8 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
    showDialog(
      context: parentContext,
      builder: (context) => CreateCommunityDialog(
-        communities: widget.communities,
+        isEditMode: false,
+        existingCommunityNames:  widget.communities.map((community) => community.name).toList(),
        onCreateCommunity: (String communityName, String description) {
          parentContext.read<SpaceManagementBloc>().add(
                CreateCommunityEvent(
@ -84,4 +85,5 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
      ),
    );
  }
+
 }
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart
@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';

-class CommunityStructureHeader extends StatelessWidget {
+class CommunityStructureHeader extends StatefulWidget {
  final String? communityName;
  final bool isEditingName;
  final bool isSave;
@ -13,19 +15,28 @@ class CommunityStructureHeader extends StatelessWidget {
  final VoidCallback onDelete;
  final VoidCallback onEditName;
  final ValueChanged<String> onNameSubmitted;
+  final List<CommunityModel> communities;
+  final CommunityModel? community;

-  const CommunityStructureHeader({
-    Key? key,
-    required this.communityName,
-    required this.isSave,
-    required this.isEditingName,
-    required this.nameController,
-    required this.onSave,
-    required this.onDelete,
-    required this.onEditName,
-    required this.onNameSubmitted,
-  }) : super(key: key);
+  const CommunityStructureHeader(
+      {super.key,
+      required this.communityName,
+      required this.isSave,
+      required this.isEditingName,
+      required this.nameController,
+      required this.onSave,
+      required this.onDelete,
+      required this.onEditName,
+      required this.onNameSubmitted,
+      this.community,
+      required this.communities});

+  @override
+  State<CommunityStructureHeader> createState() =>
+      _CommunityStructureHeaderState();
+}
+
+class _CommunityStructureHeaderState extends State<CommunityStructureHeader> {
  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
@ -60,47 +71,63 @@ class CommunityStructureHeader extends StatelessWidget {
    );
  }

+  void _showCreateCommunityDialog(BuildContext parentContext) {
+    showDialog(
+      context: parentContext,
+      builder: (context) => CreateCommunityDialog(
+        isEditMode: true,
+        existingCommunityNames:
+            widget.communities.map((community) => community.name).toList(),
+        initialName: widget.community?.name ?? '',
+        onCreateCommunity: (String communityName, String description) {
+          widget.onNameSubmitted(communityName);
+        },
+      ),
+    );
+  }
+
  Widget _buildCommunityInfo(ThemeData theme, double screenWidth) {
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        Text(
          'Community Structure',
-          style: theme.textTheme.headlineLarge?.copyWith(color: ColorsManager.blackColor),
+          style: theme.textTheme.headlineLarge
+              ?.copyWith(color: ColorsManager.blackColor),
        ),
-        if (communityName != null)
+        if (widget.communityName != null)
          Row(
            children: [
              Expanded(
                child: Row(
                  children: [
-                    if (!isEditingName)
+                    if (!widget.isEditingName)
                      Flexible(
                        child: Text(
-                          communityName!,
-                          style:
-                              theme.textTheme.bodyLarge?.copyWith(color: ColorsManager.blackColor),
+                          widget.communityName!,
+                          style: theme.textTheme.bodyLarge
+                              ?.copyWith(color: ColorsManager.blackColor),
                          overflow: TextOverflow.ellipsis,
                          maxLines: 1,
                        ),
                      ),
-                    if (isEditingName)
+                    if (widget.isEditingName)
                      SizedBox(
                        width: screenWidth * 0.1,
                        child: TextField(
-                          controller: nameController,
+                          controller: widget.nameController,
                          decoration: const InputDecoration(
                            border: InputBorder.none,
                            isDense: true,
                          ),
-                          style:
-                              theme.textTheme.bodyLarge?.copyWith(color: ColorsManager.blackColor),
-                          onSubmitted: onNameSubmitted,
+                          style: theme.textTheme.bodyLarge
+                              ?.copyWith(color: ColorsManager.blackColor),
+                          onSubmitted: widget.onNameSubmitted,
                        ),
                      ),
                    const SizedBox(width: 2),
                    GestureDetector(
-                      onTap: onEditName,
+                      onTap: () => _showCreateCommunityDialog(context),
                      child: SvgPicture.asset(
                        Assets.iconEdit,
                        width: 16,
@ -110,7 +137,7 @@ class CommunityStructureHeader extends StatelessWidget {
                  ],
                ),
              ),
-              if (isSave) ...[
+              if (widget.isSave) ...[
                const SizedBox(width: 8),
                _buildActionButtons(theme),
              ],
@ -127,8 +154,9 @@ class CommunityStructureHeader extends StatelessWidget {
      children: [
        _buildButton(
            label: "Save",
-            icon: const Icon(Icons.save, size: 18, color: ColorsManager.spaceColor),
-            onPressed: onSave,
+            icon: const Icon(Icons.save,
+                size: 18, color: ColorsManager.spaceColor),
+            onPressed: widget.onSave,
            theme: theme),
      ],
    );
@ -159,7 +187,8 @@ class CommunityStructureHeader extends StatelessWidget {
            Flexible(
              child: Text(
                label,
-                style: theme.textTheme.bodySmall?.copyWith(color: ColorsManager.blackColor),
+                style: theme.textTheme.bodySmall
+                    ?.copyWith(color: ColorsManager.blackColor),
                overflow: TextOverflow.ellipsis,
                maxLines: 1,
              ),
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@ -4,19 +4,19 @@ import 'package:flutter_bloc/flutter_bloc.dart';

 // Syncrow project imports
 import 'package:syncrow_web/pages/common/buttons/add_space_button.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/blank_community_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_structure_header_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/create_space_dialog.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/curved_line_painter.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_card_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_container_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/blank_community_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_header_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/curved_line_painter.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_card_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_container_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';

 class CommunityStructureArea extends StatefulWidget {
@ -119,7 +119,9 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
            CommunityStructureHeader(
+              communities: widget.communities,
              communityName: widget.selectedCommunity?.name,
+              community: widget.selectedCommunity,
              isSave: isSave(spaces),
              isEditingName: isEditingName,
              nameController: _nameController,
--- a/lib/pages/spaces_management/all_spaces/widgets/community_tile.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_tile.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/counter_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/counter_widget.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/curved_line_painter.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/curved_line_painter.dart
@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/connection_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/connection_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';

 class CurvedLinePainter extends CustomPainter {
--- a/lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart
@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/add_device_type_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/dialogs/icon_selection_dialog.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/hoverable_button.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/add_device_type_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/hoverable_button.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/space_icon_const.dart';
--- a/lib/pages/spaces_management/all_spaces/widgets/dialogs/delete_dialogue.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/dialogs/delete_dialogue.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/dialogs/icon_selection_dialog.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/gradient_canvas_border_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/gradient_canvas_border_widget.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/hoverable_button.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/hoverable_button.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_structure_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/gradient_canvas_border_widget.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/sidebar_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/gradient_canvas_border_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart';

 class LoadedSpaceView extends StatefulWidget {
  final List<CommunityModel> communities;
--- a/lib/pages/spaces_management/all_spaces/widgets/plus_button_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/plus_button_widget.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/common/search_bar.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/community_tile.dart';
-import 'package:syncrow_web/pages/spaces_management/widgets/space_tile_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_tile.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/style.dart';
--- a/lib/pages/spaces_management/all_spaces/widgets/space_card_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/space_card_widget.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/space_container_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/space_container_widget.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart
--- a/lib/pages/spaces_management/all_spaces/widgets/space_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/space_widget.dart
--- a/lib/pages/spaces_management/create_community/bloc/community_dialog_bloc.dart
+++ b/lib/pages/spaces_management/create_community/bloc/community_dialog_bloc.dart
@ -0,0 +1,21 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'community_dialog_event.dart';
+import 'community_dialog_state.dart';
+
+class CommunityDialogBloc extends Bloc<CommunityDialogEvent, CommunityDialogState> {
+  final List<String> existingCommunityNames;
+
+  CommunityDialogBloc(this.existingCommunityNames)
+      : super(CommunityDialogInitial()) {
+    on<ValidateCommunityNameEvent>((event, emit) {
+      final trimmedName = event.name.trim();
+      final isNameValid = !existingCommunityNames.contains(trimmedName);
+      final isNameEmpty = trimmedName.isEmpty;
+
+      emit(CommunityNameValidationState(
+        isNameValid: isNameValid,
+        isNameEmpty: isNameEmpty,
+      ));
+    });
+  }
+}
--- a/lib/pages/spaces_management/create_community/bloc/community_dialog_event.dart
+++ b/lib/pages/spaces_management/create_community/bloc/community_dialog_event.dart
@ -0,0 +1,15 @@
+import 'package:equatable/equatable.dart';
+
+abstract class CommunityDialogEvent extends Equatable {
+  @override
+  List<Object?> get props => [];
+}
+
+class ValidateCommunityNameEvent extends CommunityDialogEvent {
+  final String name;
+
+  ValidateCommunityNameEvent(this.name);
+
+  @override
+  List<Object?> get props => [name];
+}
--- a/lib/pages/spaces_management/create_community/bloc/community_dialog_state.dart
+++ b/lib/pages/spaces_management/create_community/bloc/community_dialog_state.dart
@ -0,0 +1,21 @@
+import 'package:equatable/equatable.dart';
+
+abstract class CommunityDialogState extends Equatable {
+  @override
+  List<Object?> get props => [];
+}
+
+class CommunityDialogInitial extends CommunityDialogState {}
+
+class CommunityNameValidationState extends CommunityDialogState {
+  final bool isNameValid;
+  final bool isNameEmpty;
+
+  CommunityNameValidationState({
+    required this.isNameValid,
+    required this.isNameEmpty,
+  });
+
+  @override
+  List<Object?> get props => [isNameValid, isNameEmpty];
+}
--- a/lib/pages/spaces_management/create_community/view/create_community_dialog.dart
+++ b/lib/pages/spaces_management/create_community/view/create_community_dialog.dart
@ -0,0 +1,170 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_event.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/bloc/community_dialog_state.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
+import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+
+class CreateCommunityDialog extends StatelessWidget {
+  final Function(String name, String description) onCreateCommunity;
+  final List<String> existingCommunityNames;
+  final bool isEditMode;
+  final String? initialName;
+
+  const CreateCommunityDialog({
+    super.key,
+    required this.onCreateCommunity,
+    required this.existingCommunityNames,
+    required this.isEditMode,
+    this.initialName,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final nameController =
+        TextEditingController(text: isEditMode ? initialName : '');
+
+    return BlocProvider(
+      create: (_) => CommunityDialogBloc(existingCommunityNames),
+      child: Dialog(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
+        backgroundColor: ColorsManager.transparentColor,
+        child: Stack(
+          children: [
+            Container(
+              width: MediaQuery.of(context).size.width * 0.3,
+              padding: const EdgeInsets.all(20),
+              decoration: BoxDecoration(
+                color: ColorsManager.whiteColors,
+                borderRadius: BorderRadius.circular(20),
+                boxShadow: [
+                  BoxShadow(
+                    color: ColorsManager.blackColor.withOpacity(0.25),
+                    blurRadius: 20,
+                    spreadRadius: 5,
+                    offset: const Offset(0, 5),
+                  ),
+                ],
+              ),
+              child: SingleChildScrollView(
+                child: BlocBuilder<CommunityDialogBloc, CommunityDialogState>(
+                  builder: (context, state) {
+                    bool isNameValid = true;
+                    bool isNameEmpty = false;
+
+                    if (state is CommunityNameValidationState) {
+                      isNameValid = state.isNameValid;
+                      isNameEmpty = state.isNameEmpty;
+                    }
+
+                    return Column(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          isEditMode ? 'Edit Community Name' : 'Community Name',
+                          style: Theme.of(context).textTheme.headlineMedium,
+                        ),
+                        const SizedBox(height: 18),
+                        TextField(
+                          controller: nameController,
+                          onChanged: (value) {
+                            context
+                                .read<CommunityDialogBloc>()
+                                .add(ValidateCommunityNameEvent(value));
+                          },
+                          style: const TextStyle(
+                            color: ColorsManager.blackColor,
+                          ),
+                          decoration: InputDecoration(
+                            hintText: 'Please enter the community name',
+                            filled: true,
+                            fillColor: ColorsManager.boxColor,
+                            enabledBorder: OutlineInputBorder(
+                              borderSide: BorderSide(
+                                color: isNameValid && !isNameEmpty
+                                    ? ColorsManager.boxColor
+                                    : ColorsManager.red,
+                                width: 1,
+                              ),
+                              borderRadius: BorderRadius.circular(10),
+                            ),
+                            focusedBorder: OutlineInputBorder(
+                              borderRadius: BorderRadius.circular(10),
+                              borderSide: const BorderSide(
+                                color: ColorsManager.boxColor,
+                                width: 1.5,
+                              ),
+                            ),
+                          ),
+                        ),
+                        if (!isNameValid)
+                          Padding(
+                            padding: const EdgeInsets.only(top: 8.0),
+                            child: Text(
+                              '*Name already exists.',
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall
+                                  ?.copyWith(color: ColorsManager.red),
+                            ),
+                          ),
+                        if (isNameEmpty)
+                          Padding(
+                            padding: const EdgeInsets.only(top: 8.0),
+                            child: Text(
+                              '*Name should not be empty.',
+                              style: Theme.of(context)
+                                  .textTheme
+                                  .bodySmall
+                                  ?.copyWith(color: ColorsManager.red),
+                            ),
+                          ),
+                        const SizedBox(height: 24),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Expanded(
+                              child: CancelButton(
+                                label: 'Cancel',
+                                onPressed: () => Navigator.of(context).pop(),
+                              ),
+                            ),
+                            const SizedBox(width: 16),
+                            Expanded(
+                              child: DefaultButton(
+                                onPressed: () {
+                                  if (isNameValid && !isNameEmpty) {
+                                    onCreateCommunity(
+                                      nameController.text.trim(),
+                                      "",
+                                    );
+                                    Navigator.of(context).pop();
+                                  }
+                                },
+                                backgroundColor: isNameValid && !isNameEmpty
+                                    ? ColorsManager.secondaryColor
+                                    : ColorsManager.lightGrayColor,
+                                borderRadius: 10,
+                                foregroundColor: ColorsManager.whiteColors,
+                                child: const Text('OK'),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ],
+                    );
+                  },
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/pages/spaces_management/widgets/dialogs/create_community_dialog.dart
+++ b/lib/pages/spaces_management/widgets/dialogs/create_community_dialog.dart
@ -1,177 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class CreateCommunityDialog extends StatefulWidget {
-  final Function(String name, String description) onCreateCommunity;
-  final List<CommunityModel> communities;
-
-  const CreateCommunityDialog(
-      {super.key, required this.onCreateCommunity, required this.communities});
-
-  @override
-  CreateCommunityDialogState createState() => CreateCommunityDialogState();
-}
-
-class CreateCommunityDialogState extends State<CreateCommunityDialog> {
-  String enteredName = '';
-  bool isNameFieldExist = false;
-  bool isNameEmpty = false;
-
-  @override
-  Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
-
-    return Dialog(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      backgroundColor:
-          ColorsManager.transparentColor, // Transparent for shadow effect
-      child: Stack(
-        children: [
-          // Background container with shadow and rounded corners
-          Container(
-            width: screenWidth * 0.3,
-            padding: const EdgeInsets.all(20),
-            decoration: BoxDecoration(
-              color: ColorsManager.whiteColors,
-              borderRadius: BorderRadius.circular(20),
-              boxShadow: [
-                BoxShadow(
-                  color: ColorsManager.blackColor.withOpacity(0.25),
-                  blurRadius: 20,
-                  spreadRadius: 5,
-                  offset: const Offset(0, 5),
-                ),
-              ],
-            ),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                const Text(
-                  'Community Name',
-                  style: TextStyle(
-                    fontSize: 20,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-                const SizedBox(height: 16),
-                // Input field for the community name
-                TextField(
-                  onChanged: (value) {
-                    setState(() {
-                      enteredName = value.trim();
-                      isNameFieldExist = widget.communities.any(
-                        (community) => community.name == enteredName,
-                      );
-                      if (value.isEmpty) {
-                        isNameEmpty = true;
-                      } else {
-                        isNameEmpty = false;
-                      }
-                    });
-                  },
-                  style: const TextStyle(
-                    color: ColorsManager.blackColor,
-                  ),
-                  decoration: InputDecoration(
-                    hintText: 'Please enter the community name',
-                    filled: true,
-                    fillColor: ColorsManager.boxColor,
-                    hintStyle: const TextStyle(
-                      fontSize: 14,
-                      color: ColorsManager.grayBorder,
-                      fontWeight: FontWeight.w400,
-                    ),
-                    border: OutlineInputBorder(
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor,
-                          width: 1),
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    enabledBorder: OutlineInputBorder(
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor, width: 1),
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    focusedBorder: OutlineInputBorder(
-                      borderRadius: BorderRadius.circular(10),
-                      borderSide: BorderSide(
-                          color: isNameFieldExist || isNameEmpty
-                              ? ColorsManager.red
-                              : ColorsManager.boxColor,
-                          width: 1),
-                    ),
-                  ),
-                ),
-                if (isNameFieldExist)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: Text(
-                      '*Name already exists.',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall
-                          ?.copyWith(color: ColorsManager.red),
-                    ),
-                  ),
-                if (isNameEmpty)
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: Text(
-                      '*Name should not be empty.',
-                      style: Theme.of(context)
-                          .textTheme
-                          .bodySmall
-                          ?.copyWith(color: ColorsManager.red),
-                    ),
-                  ),
-                const SizedBox(height: 24),
-                // Action buttons
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Expanded(
-                      child: CancelButton(
-                        label: 'Cancel',
-                        onPressed: () => Navigator.of(context).pop(),
-                      ),
-                    ),
-                    const SizedBox(width: 16),
-                    Expanded(
-                      child: DefaultButton(
-                        onPressed: () {
-                          if (enteredName.isNotEmpty && !isNameFieldExist) {
-                            widget.onCreateCommunity(
-                              enteredName,
-                              "",
-                            );
-                            Navigator.of(context).pop();
-                          }
-                        },
-                        backgroundColor: isNameFieldExist || isNameEmpty
-                            ? ColorsManager.lightGrayColor
-                            : ColorsManager.secondaryColor,
-                        borderRadius: 10,
-                        foregroundColor: ColorsManager.whiteColors,
-                        child: const Text('OK'),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
--- a/lib/services/product_api.dart
+++ b/lib/services/product_api.dart
@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';

--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@ -36,7 +36,6 @@ class SceneApi {
  static Future<Map<String, dynamic>> createAutomation(
      CreateAutomationModel createAutomationModel) async {
    try {
-      debugPrint("automation body ${createAutomationModel.toMap()}");
      final response = await _httpService.post(
        path: ApiEndpoints.createAutomation,
        body: createAutomationModel.toMap(),
@ -138,29 +137,49 @@ class SceneApi {
        path: ApiEndpoints.getAutomationDetails
            .replaceAll('{automationId}', automationId),
        showServerMessage: false,
-        expectedResponseModel: (json) => RoutineDetailsModel.fromJson(json),
+        expectedResponseModel: (json) => RoutineDetailsModel.fromMap(json),
+      );
+      return response;
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  //update Scene
+  static updateScene(CreateSceneModel createSceneModel, String sceneId) async {
+    try {
+      final response = await _httpService.put(
+        path: ApiEndpoints.updateScene.replaceAll('{sceneId}', sceneId),
+        body: createSceneModel
+            .toJson(sceneId.isNotEmpty == true ? sceneId : null),
+        expectedResponseModel: (json) {
+          return json;
+        },
+      );
+      return response;
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  //update automation
+  static updateAutomation(
+      CreateAutomationModel createAutomationModel, String automationId) async {
+    try {
+      final response = await _httpService.put(
+        path: ApiEndpoints.updateAutomation
+            .replaceAll('{automationId}', automationId),
+        body: createAutomationModel
+            .toJson(automationId.isNotEmpty == true ? automationId : null),
+        expectedResponseModel: (json) {
+          return json;
+        },
      );
      return response;
    } catch (e) {
      rethrow;
    }
  }
-//
-//   //updateAutomationStatus
-//   static Future<bool> updateAutomationStatus(String automationId,
-//       AutomationStatusUpdate createAutomationEnable) async {
-//     try {
-//       final response = await _httpService.put(
-//         path: ApiEndpoints.updateAutomationStatus
-//             .replaceAll('{automationId}', automationId),
-//         body: createAutomationEnable.toMap(),
-//         expectedResponseModel: (json) => json['success'],
-//       );
-//       return response;
-//     } catch (e) {
-//       rethrow;
-//     }
-//   }

  //getScene
  static Future<RoutineDetailsModel> getSceneDetails(String sceneId) async {
@ -168,52 +187,15 @@ class SceneApi {
      final response = await _httpService.get(
        path: ApiEndpoints.getScene.replaceAll('{sceneId}', sceneId),
        showServerMessage: false,
-        expectedResponseModel: (json) => RoutineDetailsModel.fromJson(json),
+        expectedResponseModel: (json) =>
+            RoutineDetailsModel.fromMap(json['data']),
      );
      return response;
    } catch (e) {
      rethrow;
    }
  }
-  //
-  // //update Scene
-  // static updateScene(CreateSceneModel createSceneModel, String sceneId) async {
-  //   try {
-  //     final response = await _httpService.put(
-  //       path: ApiEndpoints.updateScene.replaceAll('{sceneId}', sceneId),
-  //       body: createSceneModel
-  //           .toJson(sceneId.isNotEmpty == true ? sceneId : null),
-  //       expectedResponseModel: (json) {
-  //         return json;
-  //       },
-  //     );
-  //     return response;
-  //   } catch (e) {
-  //     rethrow;
-  //   }
-  // }
-  //
-  // //update automation
-  // static updateAutomation(
-  //     CreateAutomationModel createAutomationModel, String automationId) async {
-  //   try {
-  //     final response = await _httpService.put(
-  //       path: ApiEndpoints.updateAutomation
-  //           .replaceAll('{automationId}', automationId),
-  //       body: createAutomationModel
-  //           .toJson(automationId.isNotEmpty == true ? automationId : null),
-  //       expectedResponseModel: (json) {
-  //         return json;
-  //       },
-  //     );
-  //     return response;
-  //   } catch (e) {
-  //     rethrow;
-  //   }
-  // }
-  //
-  
-  
+
  //delete Scene
  static Future<bool> deleteScene(
      {required String unitUuid, required String sceneId}) async {
@ -230,7 +212,7 @@ class SceneApi {
      rethrow;
    }
  }
-  
+
  // delete automation
  static Future<bool> deleteAutomation(
      {required String unitUuid, required String automationId}) async {
--- a/lib/services/space_mana_api.dart
+++ b/lib/services/space_mana_api.dart
@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/selected_product_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_model.dart';
-import 'package:syncrow_web/pages/spaces_management/model/space_response_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_response_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';

--- a/lib/utils/app_routes.dart
+++ b/lib/utils/app_routes.dart
@ -3,7 +3,7 @@ import 'package:syncrow_web/pages/access_management/view/access_management.dart'
 import 'package:syncrow_web/pages/auth/view/login_page.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/view/device_managment_page.dart';
 import 'package:syncrow_web/pages/home/view/home_page.dart';
-import 'package:syncrow_web/pages/spaces_management/view/spaces_management_page.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/view/spaces_management_page.dart';
 import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';

@ -32,7 +32,7 @@ class AppRoutes {
      ),
      GoRoute(
          path: RoutesConst.spacesManagementPage,
-          builder: (context, state) =>  SpaceManagementPage()),
+          builder: (context, state) =>  const SpaceManagementPage()),
    ];
  }
 }
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@ -74,4 +74,7 @@ abstract class ApiEndpoints {
  static const String deleteScene = '/scene/tap-to-run/{sceneId}';

  static const String deleteAutomation = '/automation/{automationId}';
+    static const String updateScene = '/scene/tap-to-run/{sceneId}';
+
+  static const String updateAutomation = '/automation/{automationId}';
 }
--- a/lib/utils/snack_bar.dart
+++ b/lib/utils/snack_bar.dart
@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/navigation_service.dart';

 class CustomSnackBar {
@ -11,6 +12,35 @@ class CustomSnackBar {
    }
  }

+  static redSnackBar(String message) {
+    final key = NavigationService.snackbarKey;
+    BuildContext? currentContext = key?.currentContext;
+    if (key != null && currentContext != null) {
+      final snackBar = SnackBar(
+        padding: const EdgeInsets.all(16),
+        backgroundColor: ColorsManager.red,
+        content: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+          const Icon(
+            Icons.check_circle,
+            color: ColorsManager.whiteColors,
+            size: 32,
+          ),
+          const SizedBox(
+            width: 8,
+          ),
+          Text(
+            message,
+            style: Theme.of(currentContext)
+                .textTheme
+                .bodySmall!
+                .copyWith(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.green),
+          )
+        ]),
+      );
+      key.currentState?.showSnackBar(snackBar);
+    }
+  }
+
  static greenSnackBar(String message) {
    final key = NavigationService.snackbarKey;
    BuildContext? currentContext = key?.currentContext;
@ -29,8 +59,10 @@ class CustomSnackBar {
          ),
          Text(
            message,
-            style: Theme.of(currentContext).textTheme.bodySmall!.copyWith(
-                fontSize: 14, fontWeight: FontWeight.w500, color: Colors.green),
+            style: Theme.of(currentContext)
+                .textTheme
+                .bodySmall!
+                .copyWith(fontSize: 14, fontWeight: FontWeight.w500, color: Colors.green),
          )
        ]),
      );
Author	SHA1	Message	Date
hannathkadher	d423a3eb59	added focused border	2024-12-04 11:14:02 +04:00
hannathkadher	9bddd151bb	added bloc for create community	2024-12-04 11:05:46 +04:00
hannathkadher	0b628c85a5	updated create community dialog to mange edit/create	2024-12-04 10:36:41 +04:00
Abdullah Alassaf	7ee335ab1a	Bug fixes	2024-12-03 12:01:17 +03:00
Abdullah	d5ad06335b	Merge pull request #57 from SyncrowIOT/routines_issues Routines issues	2024-12-03 01:04:12 +03:00
ashraf_personal	d9ef5b4574	push fixes and merge	2024-12-03 01:02:13 +03:00
ashraf_personal	c58f2eb24e	fixed autoamtion update	2024-12-03 00:29:59 +03:00
Abdullah Alassaf	4e94d2df89	Bug fixes	2024-12-03 00:02:52 +03:00
mohammad	2f5c5d7da1	rule_disable selected & CreateAutomation actionType	2024-12-02 16:49:44 +03:00
Abdullah Alassaf	ff4ce8ed01	Bug fixes	2024-12-02 03:58:31 +03:00
mohammad	1aa6b78fb4	Bug fixes	2024-12-01 12:05:19 +03:00
Abdullah	e003d9b8b3	Merge pull request #56 from SyncrowIOT/routines_fixes Routines fixes	2024-12-01 10:50:54 +03:00
ashrafzarkanisala	76e44c8910	push changes	2024-12-01 01:07:26 +03:00
ashrafzarkanisala	02c788d03a	merge and push	2024-12-01 00:43:30 +03:00
ashrafzarkanisala	938f8c6b51	update scene debug	2024-12-01 00:42:00 +03:00
Abdullah Alassaf	3ce9a313f7	Bug fixes	2024-12-01 00:21:15 +03:00
Abdullah Alassaf	b732b0b957	Pulled latest changes	2024-11-30 21:37:55 +03:00
Abdullah Alassaf	fb6b922df4	Added delete scene function	2024-11-30 20:45:25 +03:00
ashrafzarkanisala	ce6e7700bc	push changes	2024-11-30 20:43:21 +03:00
Abdullah	8d388ac482	Merge pull request #55 from SyncrowIOT/bugfix/community-flow Bugfix/community flow	2024-11-29 18:36:03 +03:00
Abdullah	875787919e	Merge pull request #54 from SyncrowIOT/bugfix/add-new-community Bugfix/add new community	2024-11-29 14:41:52 +03:00