Release incomplete revamped space management (#360 )

## Jira User Story [SP-1686](https://syncrow.atlassian.net/browse/SP-1686) ## Description Released the new space management rewritten version, which for now includes, CRUD operations for spaces, and community tree with the new API. Rewrote main files, since they had a lot of code duplication, i extracted duplicated code into one component for all flavors to use. Enhanced routing solution, to make sure there's only one instance of the router, as the documentation of `go_router` guides us to do. ## Type of Change  - [x] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [x] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore [SP-1686]: https://syncrow.atlassian.net/browse/SP-1686?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
Merge branch 'dev' of https://github.com/SyncrowIOT/web into release_incomplete_revamped_space_management
2025-08-25 22:59:40 +00:00 · 2025-07-21 15:33:06 +03:00 · 2025-07-21 15:06:40 +03:00 · 2025-07-21 14:50:29 +03:00 · 2025-07-21 14:47:42 +03:00
16 changed files with 306 additions and 492 deletions
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,22 +1,9 @@
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/firebase_options.dart';
-import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
-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/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
-import 'package:syncrow_web/utils/app_routes.dart';
-import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
-import 'package:syncrow_web/utils/theme/theme.dart';
+import 'package:syncrow_web/syncrow_app.dart';

 Future<void> main() async {
  try {
@ -33,59 +20,5 @@ Future<void> main() async {
    );
    initialSetup();
  } catch (_) {}
-  runApp(MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  MyApp({super.key});
-
-  final GoRouter _router = GoRouter(
-    initialLocation: RoutesConst.auth,
-    routes: AppRoutes.getRoutes(),
-    redirect: (context, state) async {
-      final checkToken = await AuthBloc.getTokenAndValidate();
-      final loggedIn = checkToken == 'Success';
-      final goingToLogin = state.uri.toString() == RoutesConst.auth;
-
-      if (!loggedIn && !goingToLogin) return RoutesConst.auth;
-      if (loggedIn && goingToLogin) return RoutesConst.home;
-
-      return null;
-    },
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    return MultiBlocProvider(
-        providers: [
-          BlocProvider<CreateRoutineBloc>(
-            create: (context) => CreateRoutineBloc(),
-          ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
-          BlocProvider<VisitorPasswordBloc>(
-            create: (context) => VisitorPasswordBloc(),
-          ),
-          BlocProvider<RoutineBloc>(
-            create: (context) => RoutineBloc(),
-          ),
-          BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc(),
-          ),
-        ],
-        child: MaterialApp.router(
-          debugShowCheckedModeBanner: false,
-          scrollBehavior: const MaterialScrollBehavior().copyWith(
-            dragDevices: {
-              PointerDeviceKind.mouse,
-              PointerDeviceKind.touch,
-              PointerDeviceKind.stylus,
-              PointerDeviceKind.unknown,
-            },
-          ),
-          key: NavigationService.navigatorKey,
-          // scaffoldMessengerKey: NavigationService.snackbarKey,
-          theme: myTheme,
-          routerConfig: _router,
-        ));
-  }
+  runApp(const SyncrowApp());
 }
--- a/lib/main_dev.dart
+++ b/lib/main_dev.dart
@ -1,22 +1,9 @@
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/firebase_options.dart';
-import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
-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/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
-import 'package:syncrow_web/utils/app_routes.dart';
-import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
-import 'package:syncrow_web/utils/theme/theme.dart';
+import 'package:syncrow_web/syncrow_app.dart';

 Future<void> main() async {
  try {
@ -33,59 +20,5 @@ Future<void> main() async {
    );
    initialSetup();
  } catch (_) {}
-  runApp(MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  MyApp({super.key});
-
-  final GoRouter _router = GoRouter(
-    initialLocation: RoutesConst.auth,
-    routes: AppRoutes.getRoutes(),
-    redirect: (context, state) async {
-      final checkToken = await AuthBloc.getTokenAndValidate();
-      final loggedIn = checkToken == 'Success';
-      final goingToLogin = state.uri.toString() == RoutesConst.auth;
-
-      if (!loggedIn && !goingToLogin) return RoutesConst.auth;
-      if (loggedIn && goingToLogin) return RoutesConst.home;
-
-      return null;
-    },
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    return MultiBlocProvider(
-        providers: [
-          BlocProvider<CreateRoutineBloc>(
-            create: (context) => CreateRoutineBloc(),
-          ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
-          BlocProvider<VisitorPasswordBloc>(
-            create: (context) => VisitorPasswordBloc(),
-          ),
-          BlocProvider<RoutineBloc>(
-            create: (context) => RoutineBloc(),
-          ),
-          BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc(),
-          ),
-        ],
-        child: MaterialApp.router(
-          debugShowCheckedModeBanner: false,
-          scrollBehavior: const MaterialScrollBehavior().copyWith(
-            dragDevices: {
-              PointerDeviceKind.mouse,
-              PointerDeviceKind.touch,
-              PointerDeviceKind.stylus,
-              PointerDeviceKind.unknown,
-            },
-          ),
-          key: NavigationService.navigatorKey,
-          // scaffoldMessengerKey: NavigationService.snackbarKey,
-          theme: myTheme,
-          routerConfig: _router,
-        ));
-  }
+  runApp(const SyncrowApp());
 }
--- a/lib/main_staging.dart
+++ b/lib/main_staging.dart
@ -1,26 +1,16 @@
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
-import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/firebase_options.dart';
-import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_event.dart';
-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/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
-import 'package:syncrow_web/utils/app_routes.dart';
-import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
-import 'package:syncrow_web/utils/theme/theme.dart';
+import 'package:syncrow_web/syncrow_app.dart';

 Future<void> main() async {
  try {
-    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'staging');
+    const environment = String.fromEnvironment(
+      'FLAVOR',
+      defaultValue: 'staging',
+    );
    await dotenv.load(fileName: '.env.$environment');
    WidgetsFlutterBinding.ensureInitialized();
    await Firebase.initializeApp(
@ -30,59 +20,5 @@ Future<void> main() async {
    );
    initialSetup();
  } catch (_) {}
-  runApp(MyApp());
-}
-
-class MyApp extends StatelessWidget {
-  MyApp({super.key});
-
-  final GoRouter _router = GoRouter(
-    initialLocation: RoutesConst.auth,
-    routes: AppRoutes.getRoutes(),
-    redirect: (context, state) async {
-      final checkToken = await AuthBloc.getTokenAndValidate();
-      final loggedIn = checkToken == 'Success';
-      final goingToLogin = state.uri.toString() == RoutesConst.auth;
-
-      if (!loggedIn && !goingToLogin) return RoutesConst.auth;
-      if (loggedIn && goingToLogin) return RoutesConst.home;
-
-      return null;
-    },
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    return MultiBlocProvider(
-        providers: [
-          BlocProvider<CreateRoutineBloc>(
-            create: (context) => CreateRoutineBloc(),
-          ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
-          BlocProvider<VisitorPasswordBloc>(
-            create: (context) => VisitorPasswordBloc(),
-          ),
-          BlocProvider<RoutineBloc>(
-            create: (context) => RoutineBloc(),
-          ),
-          BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc(),
-          ),
-        ],
-        child: MaterialApp.router(
-          debugShowCheckedModeBanner: false,
-          scrollBehavior: const MaterialScrollBehavior().copyWith(
-            dragDevices: {
-              PointerDeviceKind.mouse,
-              PointerDeviceKind.touch,
-              PointerDeviceKind.stylus,
-              PointerDeviceKind.unknown,
-            },
-          ),
-          key: NavigationService.navigatorKey,
-          // scaffoldMessengerKey: NavigationService.snackbarKey,
-          theme: myTheme,
-          routerConfig: _router,
-        ));
-  }
+  runApp(const SyncrowApp());
 }
--- a/lib/pages/access_management/booking_system/presentation/bloc/calendar/events_bloc.dart
+++ b/lib/pages/access_management/booking_system/presentation/bloc/calendar/events_bloc.dart
@ -10,7 +10,7 @@ part 'events_event.dart';
 part 'events_state.dart';

 class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
-  EventController eventController = EventController();
+  final EventController eventController = EventController();
  final CalendarSystemService calendarService;

  CalendarEventsBloc({
@ -20,9 +20,7 @@ class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
    on<AddEvent>(_onAddEvent);
    on<DisposeResources>(_onDisposeResources);
    on<GoToWeek>(_onGoToWeek);
-    on<ResetEvents>(_onResetEvents);
  }
-
  Future<void> _onLoadEvents(
    LoadEvents event,
    Emitter<CalendarEventState> emit,
@ -128,18 +126,4 @@ class CalendarEventsBloc extends Bloc<CalendarEventsEvent, CalendarEventState> {
    eventController.dispose();
    return super.close();
  }
-
-  void _onResetEvents(
-    ResetEvents event,
-    Emitter<CalendarEventState> emit,
-  ) {
-    if (calendarService is MemoryCalendarServiceWithRemoteFallback) {
-      (calendarService as MemoryCalendarServiceWithRemoteFallback)
-          .memoryService
-          .clear();
-    }
-    eventController.dispose();
-    eventController = EventController();
-    emit(EventsInitial());
-  }
 }
--- a/lib/pages/access_management/booking_system/presentation/bloc/calendar/events_event.dart
+++ b/lib/pages/access_management/booking_system/presentation/bloc/calendar/events_event.dart
@ -29,10 +29,3 @@ class CheckWeekHasEvents extends CalendarEventsEvent {
  final DateTime weekStart;
  const CheckWeekHasEvents(this.weekStart);
 }
-
-class ResetEvents extends CalendarEventsEvent {
-  const ResetEvents();
-
-  @override
-  List<Object?> get props => [];
-}
--- a/lib/pages/access_management/booking_system/presentation/view/booking_page.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/booking_page.dart
@ -1,4 +1,3 @@
-// booking_page.dart
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:calendar_view/calendar_view.dart';
@ -27,33 +26,7 @@ class BookingPage extends StatefulWidget {
 }

 class _BookingPageState extends State<BookingPage> {
-  @override
-  Widget build(BuildContext context) {
-    return MultiBlocProvider(
-      providers: [
-        BlocProvider(create: (_) => SelectedBookableSpaceBloc()),
-        BlocProvider(create: (_) => DateSelectionBloc()),
-        BlocProvider(
-          create: (_) => CalendarEventsBloc(
-            calendarService: MemoryCalendarServiceWithRemoteFallback(
-              remoteService: RemoteCalendarService(HTTPService()),
-              memoryService: MemoryCalendarService(),
-            ),
-          ),
-        ),
-      ],
-      child: _BookingPageContent(),
-    );
-  }
-}
-
-class _BookingPageContent extends StatefulWidget {
-  @override
-  State<_BookingPageContent> createState() => _BookingPageContentState();
-}
-
-class _BookingPageContentState extends State<_BookingPageContent> {
-  late EventController _eventController;
+  late final EventController _eventController;

  @override
  void initState() {
@ -67,7 +40,7 @@ class _BookingPageContentState extends State<_BookingPageContent> {
    super.dispose();
  }

-  void _loadEvents(BuildContext context) {
+  void _dispatchLoadEvents(BuildContext context) {
    final selectedRoom =
        context.read<SelectedBookableSpaceBloc>().state.selectedBookableSpace;
    final dateState = context.read<DateSelectionBloc>().state;
@ -87,170 +60,186 @@ class _BookingPageContentState extends State<_BookingPageContent> {

  @override
  Widget build(BuildContext context) {
-    return BlocListener<SelectedBookableSpaceBloc, SelectedBookableSpaceState>(
-      listener: (context, state) {
-        if (state.selectedBookableSpace != null) {
-          // Reset events and clear cache when room changes
-          context.read<CalendarEventsBloc>().add(ResetEvents());
-          _loadEvents(context);
-        }
-      },
-      child: BlocListener<DateSelectionBloc, DateSelectionState>(
-        listener: (context, state) {
-          _loadEvents(context);
-        },
-        child: BlocListener<CalendarEventsBloc, CalendarEventState>(
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider(create: (_) => SelectedBookableSpaceBloc()),
+        BlocProvider(create: (_) => DateSelectionBloc()),
+        BlocProvider(
+            create: (_) => CalendarEventsBloc(
+                  calendarService: MemoryCalendarServiceWithRemoteFallback(
+                    remoteService: RemoteCalendarService(
+                      HTTPService(),
+                    ),
+                    memoryService: MemoryCalendarService(),
+                  ),
+                )),
+      ],
+      child: Builder(
+        builder: (context) =>
+            BlocListener<CalendarEventsBloc, CalendarEventState>(
+          listenWhen: (prev, curr) => curr is EventsLoaded,
          listener: (context, state) {
            if (state is EventsLoaded) {
              _eventController.removeWhere((_) => true);
              _eventController.addAll(state.events);
            }
          },
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Expanded(
-                child: Container(
-                  decoration: BoxDecoration(
-                    color: ColorsManager.whiteColors,
-                    boxShadow: [
-                      BoxShadow(
-                        color: ColorsManager.blackColor.withOpacity(0.1),
-                        offset: const Offset(3, 0),
-                        blurRadius: 6,
-                        spreadRadius: 0,
-                      ),
-                    ],
-                  ),
-                  child: Column(
-                    children: [
-                      Expanded(
-                        flex: 2,
-                        child: BlocBuilder<SelectedBookableSpaceBloc,
-                            SelectedBookableSpaceState>(
-                          builder: (context, state) {
-                            return BookingSidebar(
-                              onRoomSelected: (selectedRoom) {
-                                context
-                                    .read<SelectedBookableSpaceBloc>()
-                                    .add(SelectBookableSpace(selectedRoom));
-                              },
-                            );
-                          },
-                        ),
-                      ),
-                      Expanded(
-                        child:
-                            BlocBuilder<DateSelectionBloc, DateSelectionState>(
-                          builder: (context, dateState) {
-                            return CustomCalendarPage(
-                              selectedDate: dateState.selectedDate,
-                              onDateChanged: (day, month, year) {
-                                final newDate = DateTime(year, month, day);
-                                context
-                                    .read<DateSelectionBloc>()
-                                    .add(SelectDate(newDate));
-                                context.read<DateSelectionBloc>().add(
-                                    SelectDateFromSidebarCalendar(newDate));
-                              },
-                            );
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-              Expanded(
-                flex: 5,
-                child: Padding(
-                  padding: const EdgeInsets.all(20.0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          Row(
-                            children: [
-                              SvgTextButton(
-                                svgAsset: Assets.homeIcon,
-                                label: 'Manage Bookable Spaces',
-                                onPressed: () {},
-                              ),
-                              const SizedBox(width: 20),
-                              SvgTextButton(
-                                svgAsset: Assets.groupIcon,
-                                label: 'Manage Users',
-                                onPressed: () {},
-                              ),
-                            ],
-                          ),
-                          BlocBuilder<DateSelectionBloc, DateSelectionState>(
-                            builder: (context, state) {
-                              final weekStart = state.weekStart;
-                              final weekEnd =
-                                  weekStart.add(const Duration(days: 6));
-                              return WeekNavigation(
-                                weekStart: weekStart,
-                                weekEnd: weekEnd,
-                                onPreviousWeek: () {
-                                  context
-                                      .read<DateSelectionBloc>()
-                                      .add(PreviousWeek());
-                                },
-                                onNextWeek: () {
-                                  context
-                                      .read<DateSelectionBloc>()
-                                      .add(NextWeek());
-                                },
-                              );
-                            },
+          child: BlocListener<SelectedBookableSpaceBloc,
+              SelectedBookableSpaceState>(
+            listener: (context, state) => _dispatchLoadEvents(context),
+            child: BlocListener<DateSelectionBloc, DateSelectionState>(
+              listener: (context, state) => _dispatchLoadEvents(context),
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Expanded(
+                    child: Container(
+                      decoration: BoxDecoration(
+                        color: ColorsManager.whiteColors,
+                        boxShadow: [
+                          BoxShadow(
+                            color: ColorsManager.blackColor.withOpacity(0.1),
+                            offset: const Offset(3, 0),
+                            blurRadius: 6,
+                            spreadRadius: 0,
                          ),
                        ],
                      ),
-                      const SizedBox(height: 20),
-                      Expanded(
-                        flex: 5,
-                        child: BlocBuilder<SelectedBookableSpaceBloc,
-                            SelectedBookableSpaceState>(
-                          builder: (context, roomState) {
-                            final selectedRoom =
-                                roomState.selectedBookableSpace;
-                            return BlocBuilder<DateSelectionBloc,
+                      child: Column(
+                        children: [
+                          Expanded(
+                            flex: 2,
+                            child: BlocBuilder<SelectedBookableSpaceBloc,
+                                SelectedBookableSpaceState>(
+                              builder: (context, state) {
+                                return BookingSidebar(
+                                  onRoomSelected: (selectedRoom) {
+                                    context
+                                        .read<SelectedBookableSpaceBloc>()
+                                        .add(SelectBookableSpace(selectedRoom));
+                                  },
+                                );
+                              },
+                            ),
+                          ),
+                          Expanded(
+                            child: BlocBuilder<DateSelectionBloc,
                                DateSelectionState>(
                              builder: (context, dateState) {
-                                return BlocBuilder<CalendarEventsBloc,
-                                    CalendarEventState>(
-                                  builder: (context, eventState) {
-                                    return WeeklyCalendarPage(
-                                      key: ValueKey(
-                                          selectedRoom?.uuid ?? 'no-room'),
-                                      startTime: selectedRoom
-                                          ?.bookableConfig.startTime,
-                                      endTime:
-                                          selectedRoom?.bookableConfig.endTime,
-                                      weekStart: dateState.weekStart,
-                                      selectedDate: dateState.selectedDate,
-                                      eventController: _eventController,
-                                      selectedDateFromSideBarCalender: context
-                                          .watch<DateSelectionBloc>()
-                                          .state
-                                          .selectedDateFromSideBarCalender,
-                                      // isLoading: eventState is EventsLoading,
+                                return CustomCalendarPage(
+                                  selectedDate: dateState.selectedDate,
+                                  onDateChanged: (day, month, year) {
+                                    final newDate = DateTime(year, month, day);
+                                    context
+                                        .read<DateSelectionBloc>()
+                                        .add(SelectDate(newDate));
+                                    context.read<DateSelectionBloc>().add(
+                                        SelectDateFromSidebarCalendar(newDate));
+                                  },
+                                );
+                              },
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                  Expanded(
+                    flex: 5,
+                    child: Padding(
+                      padding: const EdgeInsets.all(20.0),
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              Row(
+                                children: [
+                                  SvgTextButton(
+                                    svgAsset: Assets.homeIcon,
+                                    label: 'Manage Bookable Spaces',
+                                    onPressed: () {},
+                                  ),
+                                  const SizedBox(width: 20),
+                                  SvgTextButton(
+                                    svgAsset: Assets.groupIcon,
+                                    label: 'Manage Users',
+                                    onPressed: () {},
+                                  ),
+                                ],
+                              ),
+                              BlocBuilder<DateSelectionBloc,
+                                  DateSelectionState>(
+                                builder: (context, state) {
+                                  final weekStart = state.weekStart;
+                                  final weekEnd =
+                                      weekStart.add(const Duration(days: 6));
+                                  return WeekNavigation(
+                                    weekStart: weekStart,
+                                    weekEnd: weekEnd,
+                                    onPreviousWeek: () {
+                                      context
+                                          .read<DateSelectionBloc>()
+                                          .add(PreviousWeek());
+                                    },
+                                    onNextWeek: () {
+                                      context
+                                          .read<DateSelectionBloc>()
+                                          .add(NextWeek());
+                                    },
+                                  );
+                                },
+                              ),
+                            ],
+                          ),
+                          Expanded(
+                            flex: 5,
+                            child: BlocBuilder<SelectedBookableSpaceBloc,
+                                SelectedBookableSpaceState>(
+                              builder: (context, roomState) {
+                                final selectedRoom =
+                                    roomState.selectedBookableSpace;
+                                return BlocBuilder<DateSelectionBloc,
+                                    DateSelectionState>(
+                                  builder: (context, dateState) {
+                                    return BlocListener<CalendarEventsBloc,
+                                        CalendarEventState>(
+                                      listenWhen: (prev, curr) =>
+                                          curr is EventsLoaded,
+                                      listener: (context, state) {
+                                        if (state is EventsLoaded) {
+                                          _eventController
+                                              .removeWhere((_) => true);
+                                          _eventController.addAll(state.events);
+                                        }
+                                      },
+                                      child: WeeklyCalendarPage(
+                                        startTime: selectedRoom
+                                            ?.bookableConfig.startTime,
+                                        endTime: selectedRoom
+                                            ?.bookableConfig.endTime,
+                                        weekStart: dateState.weekStart,
+                                        selectedDate: dateState.selectedDate,
+                                        eventController: _eventController,
+                                        selectedDateFromSideBarCalender: context
+                                            .watch<DateSelectionBloc>()
+                                            .state
+                                            .selectedDateFromSideBarCalender,
+                                      ),
                                    );
                                  },
                                );
                              },
-                            );
-                          },
-                        ),
+                            ),
+                          ),
+                        ],
                      ),
-                    ],
+                    ),
                  ),
-                ),
+                ],
              ),
-            ],
+            ),
          ),
        ),
      ),
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/booking_sidebar.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/booking_sidebar.dart
@ -76,29 +76,21 @@ class __SidebarContentState extends State<_SidebarContent> {
      builder: (context, state) {
        return Column(
          children: [
-            Padding(
-              padding: const EdgeInsets.only(top: 10.0, bottom: 10.0),
-              child: Container(
-                  decoration: BoxDecoration(
-                    color: ColorsManager.whiteColors,
-                    boxShadow: [
-                      BoxShadow(
-                        color: ColorsManager.blackColor.withOpacity(0.1),
-                        offset: const Offset(0, 4),
-                        blurRadius: 4,
-                        spreadRadius: 0,
-                      ),
-                    ],
-                  ),
-                  child: _SidebarHeader(title: 'Spaces')),
-            ),
+            const _SidebarHeader(title: 'Spaces'),
            Container(
              decoration: BoxDecoration(
                color: ColorsManager.whiteColors,
+                borderRadius: BorderRadius.circular(8.0),
                boxShadow: [
                  BoxShadow(
                    color: ColorsManager.blackColor.withOpacity(0.1),
-                    offset: const Offset(0, 4),
+                    offset: const Offset(0, -2),
+                    blurRadius: 4,
+                    spreadRadius: 0,
+                  ),
+                  BoxShadow(
+                    color: ColorsManager.blackColor.withOpacity(0.1),
+                    offset: const Offset(0, 2),
                    blurRadius: 4,
                    spreadRadius: 0,
                  ),
@ -228,7 +220,7 @@ class _SidebarHeader extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Padding(
-      padding: const EdgeInsets.all(10.0),
+      padding: const EdgeInsets.all(16.0),
      child: Row(
        mainAxisAlignment: MainAxisAlignment.spaceBetween,
        children: [
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/custom_calendar_page.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/custom_calendar_page.dart
@ -66,28 +66,18 @@ class _CustomCalendarPageState extends State<CustomCalendarPage> {
      weekdayLabels: const ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'],
    );

-    return Container(
-      decoration: const BoxDecoration(
-        border: Border(
-          top: BorderSide(
-            color: ColorsManager.textGray,
-            width: 1.0,
-          ),
-        ),
-      ),
-      child: CalendarDatePicker2(
-        config: config,
-        value: [_selectedDate],
-        onValueChanged: (dates) {
-          final picked = dates.first;
-          if (picked != null) {
-            setState(() {
-              _selectedDate = picked;
-            });
-            widget.onDateChanged(picked.day, picked.month, picked.year);
-          }
-        },
-      ),
+    return CalendarDatePicker2(
+      config: config,
+      value: [_selectedDate],
+      onValueChanged: (dates) {
+        final picked = dates.first;
+        if (picked != null) {
+          setState(() {
+            _selectedDate = picked;
+          });
+          widget.onDateChanged(picked.day, picked.month, picked.year);
+        }
+      },
    );
  }
 }
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/event_tile_widget.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/event_tile_widget.dart
@ -32,17 +32,15 @@ class EventTileWidget extends StatelessWidget {
          return Expanded(
            child: Container(
              width: double.infinity,
-              padding: const EdgeInsets.all(5),
+              padding: EdgeInsets.all(5),
              decoration: BoxDecoration(
                color: isEventEnded
                    ? ColorsManager.grayColor.withOpacity(0.1)
                    : ColorsManager.blue1.withOpacity(0.1),
                borderRadius: BorderRadius.circular(6),
-                border: Border(
+                border: const Border(
                  left: BorderSide(
-                    color: isEventEnded
-                        ? ColorsManager.grayColor
-                        : ColorsManager.secondaryColor,
+                    color: ColorsManager.grayColor,
                    width: 4,
                  ),
                ),
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/room_list_item.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/room_list_item.dart
@ -21,7 +21,7 @@ class RoomListItem extends StatelessWidget {
      groupValue: isSelected ? room.uuid : null,
      visualDensity: const VisualDensity(vertical: -4),
      onChanged: (value) => onTap(),
-      activeColor: ColorsManager.secondaryColor,
+      activeColor: ColorsManager.primaryColor,
      title: Text(
        room.spaceName,
        maxLines: 2,
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/week_day_header.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/week_day_header.dart
@ -14,33 +14,26 @@ class WeekDayHeader extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return ColoredBox(
-      color: isSelectedDay
-          ? ColorsManager.secondaryColor.withOpacity(0.1)
-          : Colors.transparent,
-      child: Column(
-        children: [
-          const SizedBox(
-            height: 10,
+    return Column(
+      children: [
+        Text(
+          DateFormat('EEE').format(date).toUpperCase(),
+          style: TextStyle(
+            fontWeight: FontWeight.w400,
+            fontSize: 14,
+            color: isSelectedDay ? Colors.blue : Colors.black,
          ),
-          Text(
-            DateFormat('EEE').format(date).toUpperCase(),
-            style: const TextStyle(
-              fontWeight: FontWeight.w400,
-              fontSize: 14,
-              color: ColorsManager.blackColor,
-            ),
+        ),
+        Text(
+          DateFormat('d').format(date),
+          style: TextStyle(
+            fontWeight: FontWeight.w700,
+            fontSize: 20,
+            color:
+                isSelectedDay ? ColorsManager.blue1 : ColorsManager.blackColor,
          ),
-          Text(
-            DateFormat('d').format(date),
-            style: const TextStyle(
-              fontWeight: FontWeight.w700,
-              fontSize: 30,
-              color: ColorsManager.blackColor,
-            ),
-          ),
-        ],
-      ),
+        ),
+      ],
    );
  }
 }
--- a/lib/pages/access_management/booking_system/presentation/view/widgets/weekly_calendar_page.dart
+++ b/lib/pages/access_management/booking_system/presentation/view/widgets/weekly_calendar_page.dart
@ -24,7 +24,7 @@ class WeeklyCalendarPage extends StatelessWidget {
  });
  static const double timeLineWidth = 65;
  static const int totalDays = 7;
-  static const double dayColumnWidth = 220;
+  static const double dayColumnWidth = 220; 

  final double calendarContentWidth =
      timeLineWidth + (totalDays * dayColumnWidth);
@ -57,10 +57,13 @@ class WeeklyCalendarPage extends StatelessWidget {
      );
    }

-    const double timeLineWidth = 90;
+  
+
+    const double timeLineWidth = 65;

    return LayoutBuilder(
      builder: (context, constraints) {
+  
        bool isInRange(DateTime date, DateTime start, DateTime end) {
          !date.isBefore(start) && !date.isAfter(end);
          // remove this line and Check if the date is within the range
@ -97,6 +100,7 @@ class WeeklyCalendarPage extends StatelessWidget {
                              width: width,
                              decoration: BoxDecoration(
                                color: Colors.orange.withOpacity(0.13),
+                                borderRadius: BorderRadius.circular(8),
                              ),
                            );
                          } else if (isSelected) {
@ -106,6 +110,7 @@ class WeeklyCalendarPage extends StatelessWidget {
                              decoration: BoxDecoration(
                                color:
                                    ColorsManager.spaceColor.withOpacity(0.07),
+                                borderRadius: BorderRadius.circular(8),
                              ),
                            );
                          }
@ -138,7 +143,7 @@ class WeeklyCalendarPage extends StatelessWidget {
                        heightPerMinute: 1.7,
                        showLiveTimeLineInAllDays: false,
                        showVerticalLines: true,
-                        emulateVerticalOffsetBy: -95,
+                        emulateVerticalOffsetBy: -80,
                        startDay: WeekDays.monday,
                        liveTimeIndicatorSettings:
                            const LiveTimeIndicatorSettings(
@ -156,7 +161,7 @@ class WeeklyCalendarPage extends StatelessWidget {
                        },
                        timeLineWidth: timeLineWidth,
                        weekPageHeaderBuilder: (start, end) => Container(),
-                        weekTitleHeight: 90,
+                        weekTitleHeight: 60,
                        weekNumberBuilder: (firstDayOfWeek) => Padding(
                          padding: const EdgeInsets.only(right: 15, bottom: 10),
                          child: Column(
@ -203,6 +208,8 @@ class WeeklyCalendarPage extends StatelessWidget {
      },
    );
  }
+
+
 }

 bool isSameDay(DateTime d1, DateTime d2) {
--- a/lib/services/locator.dart
+++ b/lib/services/locator.dart
@ -4,9 +4,7 @@ import 'package:syncrow_web/services/api/http_interceptor.dart';
 import 'package:syncrow_web/services/api/http_service.dart';

 final GetIt serviceLocator = GetIt.instance;
-//setupLocator() // to search for dependency injection in flutter
-initialSetup() {
+void initialSetup() {
  serviceLocator.registerSingleton<HTTPInterceptor>(HTTPInterceptor());
-  //Base classes
  serviceLocator.registerSingleton<Dio>(HTTPService.setupDioClient());
 }
--- a/lib/syncrow_app.dart
+++ b/lib/syncrow_app.dart
@ -0,0 +1,53 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/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/visitor_password/bloc/visitor_password_bloc.dart';
+import 'package:syncrow_web/utils/app_routes.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
+import 'package:syncrow_web/utils/theme/theme.dart';
+
+class SyncrowApp extends StatelessWidget {
+  const SyncrowApp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider<CreateRoutineBloc>(
+          create: (context) => CreateRoutineBloc(),
+        ),
+        BlocProvider(
+          create: (context) => HomeBloc()..add(const FetchUserInfo()),
+        ),
+        BlocProvider<VisitorPasswordBloc>(
+          create: (context) => VisitorPasswordBloc(),
+        ),
+        BlocProvider<RoutineBloc>(
+          create: (context) => RoutineBloc(),
+        ),
+        BlocProvider<SpaceTreeBloc>(
+          create: (context) => SpaceTreeBloc(),
+        ),
+      ],
+      child: MaterialApp.router(
+        debugShowCheckedModeBanner: false,
+        scrollBehavior: const MaterialScrollBehavior().copyWith(
+          dragDevices: {
+            PointerDeviceKind.mouse,
+            PointerDeviceKind.touch,
+            PointerDeviceKind.stylus,
+            PointerDeviceKind.unknown,
+          },
+        ),
+        key: NavigationService.navigatorKey,
+        theme: myTheme,
+        routerConfig: AppRoutes.router,
+      ),
+    );
+  }
+}
--- a/lib/utils/app_routes.dart
+++ b/lib/utils/app_routes.dart
@ -1,17 +1,31 @@
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/access_management/view/access_management.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/views/analytics_page.dart';
+import 'package:syncrow_web/pages/auth/bloc/auth_bloc.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/roles_and_permission/view/roles_and_permission_page.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/view/spaces_management_page.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/views/space_management_page.dart';
 import 'package:syncrow_web/pages/visitor_password/view/visitor_password_dialog.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';

-class AppRoutes {
-  static List<GoRoute> getRoutes() {
-    return [
+abstract final class AppRoutes {
+  const AppRoutes._();
+
+  static final GoRouter router = GoRouter(
+    initialLocation: RoutesConst.auth,
+    redirect: (context, state) async {
+      final checkToken = await AuthBloc.getTokenAndValidate();
+      final loggedIn = checkToken == 'Success';
+      final goingToLogin = state.uri.toString() == RoutesConst.auth;
+
+      if (!loggedIn && !goingToLogin) return RoutesConst.auth;
+      if (loggedIn && goingToLogin) return RoutesConst.home;
+
+      return null;
+    },
+    routes: [
      GoRoute(
        path: RoutesConst.auth,
        builder: (context, state) => const LoginPage(),
@ -43,6 +57,6 @@ class AppRoutes {
        name: 'analytics',
        builder: (context, state) => const AnalyticsPage(),
      ),
-    ];
-  }
+    ],
+  );
 }
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@ -140,5 +140,6 @@ abstract class ApiEndpoints {
  static const String saveSchedule = '/schedule/{deviceUuid}';

  static const String getBookableSpaces = '/bookable-spaces';
-  static const String getBookings = '/bookings?month={mm}-{yyyy}&space={space}';
+  static const String getBookings =
+      '/bookings?month={mm}%2F{yyyy}&space={space}';
 }
Author	SHA1	Message	Date
Faris Armoush	2f89c3486c	Release incomplete revamped space management (#360 ) <!-- Thanks for contributing! Provide a description of your changes below and a general summary in the title Please look at the following checklist to ensure that your PR can be accepted quickly: --> ## Jira User Story [SP-1686](https://syncrow.atlassian.net/browse/SP-1686) ## Description Released the new space management rewritten version, which for now includes, CRUD operations for spaces, and community tree with the new API. Rewrote main files, since they had a lot of code duplication, i extracted duplicated code into one component for all flavors to use. Enhanced routing solution, to make sure there's only one instance of the router, as the documentation of `go_router` guides us to do. ## Type of Change <!--- Put an `x` in all the boxes that apply: --> - [x] ✨ New feature (non-breaking change which adds functionality) - [ ] 🛠️ Bug fix (non-breaking change which fixes an issue) - [ ] ❌ Breaking change (fix or feature that would cause existing functionality to change) - [x] 🧹 Code refactor - [ ] ✅ Build configuration change - [ ] 📝 Documentation - [ ] 🗑️ Chore [SP-1686]: https://syncrow.atlassian.net/browse/SP-1686?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ	2025-07-21 15:33:06 +03:00
Faris Armoush	3a4fce966c	Merge branch 'dev' of https://github.com/SyncrowIOT/web into release_incomplete_revamped_space_management	2025-07-21 15:06:40 +03:00
Faris Armoush	6bdd28ec57	Refactor main entry points to utilize SyncrowApp, removing legacy MyApp implementation and associated dependencies, since there was too much duplicated code.	2025-07-21 14:50:29 +03:00
Faris Armoush	652163fdae	Updated Space management route in `app_routes.dart` to use the new, incomplete, revamped space management.	2025-07-21 14:47:42 +03:00