From 34565a7dab43613e7c5f14431f4f8536bcaca834 Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Wed, 18 Jun 2025 15:25:32 +0300 Subject: [PATCH] hotfix/communities_loading v2. --- lib/main.dart | 3 +-- lib/main_dev.dart | 3 +-- lib/main_staging.dart | 3 +-- .../modules/analytics/views/analytics_page.dart | 14 +++++++++++++- .../all_devices/view/device_managment_page.dart | 15 ++++++++++++++- .../all_spaces/view/spaces_management_page.dart | 7 +++++++ 6 files changed, 37 insertions(+), 8 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index d78e7907..219fc41d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart'; import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart'; import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart'; import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart'; -import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart'; import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart'; import 'package:syncrow_web/services/locator.dart'; import 'package:syncrow_web/utils/app_routes.dart'; @@ -68,7 +67,7 @@ class MyApp extends StatelessWidget { create: (context) => RoutineBloc(), ), BlocProvider( - create: (context) => SpaceTreeBloc()..add(InitialEvent()), + create: (context) => SpaceTreeBloc(), ), ], child: MaterialApp.router( diff --git a/lib/main_dev.dart b/lib/main_dev.dart index 2983b94c..410110d1 100644 --- a/lib/main_dev.dart +++ b/lib/main_dev.dart @@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart'; import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart'; import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart'; import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart'; -import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart'; import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart'; import 'package:syncrow_web/services/locator.dart'; import 'package:syncrow_web/utils/app_routes.dart'; @@ -68,7 +67,7 @@ class MyApp extends StatelessWidget { create: (context) => RoutineBloc(), ), BlocProvider( - create: (context) => SpaceTreeBloc()..add(InitialEvent()), + create: (context) => SpaceTreeBloc(), ), ], child: MaterialApp.router( diff --git a/lib/main_staging.dart b/lib/main_staging.dart index e943d6ce..70c968c0 100644 --- a/lib/main_staging.dart +++ b/lib/main_staging.dart @@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart'; import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart'; import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart'; import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart'; -import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart'; import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart'; import 'package:syncrow_web/services/locator.dart'; import 'package:syncrow_web/utils/app_routes.dart'; @@ -65,7 +64,7 @@ class MyApp extends StatelessWidget { create: (context) => RoutineBloc(), ), BlocProvider( - create: (context) => SpaceTreeBloc()..add(InitialEvent()), + create: (context) => SpaceTreeBloc(), ), ], child: MaterialApp.router( diff --git a/lib/pages/analytics/modules/analytics/views/analytics_page.dart b/lib/pages/analytics/modules/analytics/views/analytics_page.dart index 3d8b1eb3..82f4d853 100644 --- a/lib/pages/analytics/modules/analytics/views/analytics_page.dart +++ b/lib/pages/analytics/modules/analytics/views/analytics_page.dart @@ -31,6 +31,8 @@ import 'package:syncrow_web/pages/analytics/services/range_of_aqi/remote_range_o import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart'; import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart'; import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart'; +import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart'; +import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart'; import 'package:syncrow_web/services/api/http_service.dart'; import 'package:syncrow_web/utils/theme/responsive_text_theme.dart'; import 'package:syncrow_web/web_layout/web_scaffold.dart'; @@ -130,9 +132,19 @@ class _AnalyticsPageState extends State { } } -class AnalyticsPageForm extends StatelessWidget { +class AnalyticsPageForm extends StatefulWidget { const AnalyticsPageForm({super.key}); + @override + State createState() => _AnalyticsPageFormState(); +} + +class _AnalyticsPageFormState extends State { + @override + void initState() { + context.read().add(InitialEvent()); + super.initState(); + } @override Widget build(BuildContext context) { return WebScaffold( diff --git a/lib/pages/device_managment/all_devices/view/device_managment_page.dart b/lib/pages/device_managment/all_devices/view/device_managment_page.dart index 2379c22d..8210fb2f 100644 --- a/lib/pages/device_managment/all_devices/view/device_managment_page.dart +++ b/lib/pages/device_managment/all_devices/view/device_managment_page.dart @@ -8,15 +8,28 @@ import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routi import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart'; import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart'; import 'package:syncrow_web/pages/routines/view/routines_view.dart'; +import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart'; +import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart'; import 'package:syncrow_web/utils/color_manager.dart'; import 'package:syncrow_web/utils/extension/build_context_x.dart'; import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart'; import 'package:syncrow_web/utils/theme/responsive_text_theme.dart'; import 'package:syncrow_web/web_layout/web_scaffold.dart'; -class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout { +class DeviceManagementPage extends StatefulWidget with HelperResponsiveLayout { const DeviceManagementPage({super.key}); + @override + State createState() => _DeviceManagementPageState(); +} + +class _DeviceManagementPageState extends State { + +@override + void initState() { + context.read().add(InitialEvent()); + super.initState(); + } @override Widget build(BuildContext context) { return MultiBlocProvider( diff --git a/lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart b/lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart index 291e6235..d03768b8 100644 --- a/lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart +++ b/lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart @@ -2,6 +2,7 @@ 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/space_tree/bloc/space_tree_bloc.dart'; +import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart'; import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart'; import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart'; @@ -25,6 +26,12 @@ class SpaceManagementPageState extends State { final CommunitySpaceManagementApi _api = CommunitySpaceManagementApi(); final ProductApi _productApi = ProductApi(); final SpaceModelManagementApi _spaceModelApi = SpaceModelManagementApi(); + + @override + void initState() { + context.read().add(InitialEvent()); + super.initState(); + } @override Widget build(BuildContext context) { return MultiBlocProvider(