Changes related to merge with main

acterglobal · Sep 18, 2024 · c0bb187 · c0bb187
1 parent 7b718ed
commit c0bb187
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 20 deletions.
diff --git a/app/lib/common/utils/routes.dart b/app/lib/common/utils/routes.dart
@@ -65,7 +65,6 @@ enum Routes {
   linkRecommended('/:spaceId([!#][^/]+)/linkRecommended'),
   spaceInvite('/:spaceId([!#][^/]+)/invite'),
   space('/:spaceId([!#][^/]+)'), // !spaceId, #spaceName
-  spaceRelatedSpaces('/:spaceId([!#][^/]+)/spaces'),
   subSpaces('/:spaceId([!#][^/]+)/subSpaces'),
   organizeCategories('/organizeCategories/:spaceId([^/]+)/:categoriesFor([^/]+)'),
   spaceMembers('/:spaceId([!#][^/]+)/members'),

diff --git a/app/lib/features/categories/organize_categories_page.dart b/app/lib/features/categories/organize_categories_page.dart
@@ -1,6 +1,6 @@
 import 'package:acter/common/providers/room_providers.dart';
 import 'package:acter/common/toolkit/buttons/primary_action_button.dart';
-import 'package:acter/common/widgets/spaces/space_card.dart';
+import 'package:acter/common/widgets/room/room_card.dart';
 import 'package:acter/features/categories/actions/save_categories.dart';
 import 'package:acter/features/categories/model/CategoryModelLocal.dart';
 import 'package:acter/features/categories/providers/categories_providers.dart';
@@ -116,7 +116,7 @@ class _DraggableCategoriesListState
     return List<DragAndDropItem>.generate(
       categoryList[categoryIndex].entries.length,
       (entryItemIndex) => DragAndDropItem(
-        child: SpaceCard(
+        child: RoomCard(
           roomId:
               categoryList[categoryIndex].entries[entryItemIndex].toString(),
           margin: const EdgeInsets.symmetric(vertical: 6),

diff --git a/app/lib/features/space/widgets/space_sections/spaces_section.dart b/app/lib/features/space/widgets/space_sections/spaces_section.dart
@@ -71,7 +71,7 @@ class SpacesSection extends ConsumerWidget {
           title: L10n.of(context).suggestedSpaces,
           isShowSeeAllButton: true,
           onTapSeeAll: () => context.pushNamed(
-            Routes.spaceRelatedSpaces.name,
+            Routes.subSpaces.name,
             pathParameters: {'spaceId': spaceId},
           ),
         ),

diff --git a/app/lib/features/spaces/pages/sub_spaces.dart b/app/lib/features/spaces/pages/sub_spaces.dart
@@ -1,6 +1,6 @@
 import 'package:acter/common/providers/room_providers.dart';
 import 'package:acter/common/utils/routes.dart';
-import 'package:acter/common/widgets/spaces/space_card.dart';
+import 'package:acter/common/widgets/room/room_card.dart';
 import 'package:acter/features/categories/model/CategoryModelLocal.dart';
 import 'package:acter/features/categories/providers/categories_providers.dart';
 import 'package:acter/features/categories/utils/category_utils.dart';
@@ -172,7 +172,7 @@ class SubSpaces extends ConsumerWidget {
         title: CategoryHeaderView(categoryModelLocal: categoryModelLocal),
         children: List<Widget>.generate(
           entries.length,
-          (index) => SpaceCard(
+          (index) => RoomCard(
             roomId: entries[index],
             showParents: false,
             showVisibilityMark: true,

diff --git a/app/lib/router/shell_routers/home_shell_router.dart b/app/lib/router/shell_routers/home_shell_router.dart
@@ -33,7 +33,6 @@ import 'package:acter/features/spaces/pages/sub_spaces.dart';
 import 'package:acter/features/super_invites/pages/super_invites.dart';
 import 'package:acter/features/space/pages/chats_page.dart';
 import 'package:acter/features/space/pages/members_page.dart';
-import 'package:acter/features/space/pages/sub_spaces_page.dart';
 import 'package:acter/features/space/settings/pages/apps_settings_page.dart';
 import 'package:acter/features/space/settings/pages/index_page.dart';
 import 'package:acter/features/space/settings/pages/notification_configuration_page.dart';
@@ -215,19 +214,6 @@ final homeShellRoutes = [
       );
     },
   ),
-  GoRoute(
-    name: Routes.spaceRelatedSpaces.name,
-    path: Routes.spaceRelatedSpaces.route,
-    redirect: authGuardRedirect,
-    pageBuilder: (context, state) {
-      return NoTransitionPage(
-        key: state.pageKey,
-        child: SubSpacesPage(
-          spaceIdOrAlias: state.pathParameters['spaceId']!,
-        ),
-      );
-    },
-  ),
   GoRoute(
     name: Routes.subSpaces.name,
     path: Routes.subSpaces.route,