Merge pull request #468 from OpenPecha/series-enroll-group

fix : group enrollment

Author: tentamdin

lib/core/config/protected_routes.dart

@@ -73,8 +73,10 @@ class ProtectedRoutes {
   /// The token is sent when the user is authenticated; silently skipped for guests.
   static const List<String> optionalPaths = [
     '/plans/{planId}/days',
-    // Authenticated users get joined groups excluded server-side.
     '/author/groups',
+    // Group detail + members: sends auth when logged in so fields like
+    // `is_group_enrolled` reflect the current user (anonymous GET → false).
+    '/author/groups/',
   ];
 
   /// Check if a given path is protected (requires authentication).

lib/core/config/router/app_router.dart

@@ -11,6 +11,7 @@ import 'package:flutter_pecha/features/auth/presentation/providers/state_provide
 import 'package:flutter_pecha/features/auth/presentation/screens/login_page.dart';
 import 'package:flutter_pecha/features/auth/presentation/screens/splash_screen.dart';
 import 'package:flutter_pecha/features/calendar/presentation/screens/tibetan_calendar_screen.dart';
+import 'package:flutter_pecha/features/group_profile/domain/entities/group_profile.dart';
 import 'package:flutter_pecha/features/group_profile/presentation/screens/group_profile_screen.dart';
 import 'package:flutter_pecha/features/home/domain/entities/series.dart';
 import 'package:flutter_pecha/features/home/presentation/screens/main_navigation_screen.dart';
@@ -204,7 +205,17 @@ final appRouterProvider = Provider<GoRouter>((ref) {
                   final id = state.pathParameters['id'] ?? '';
                   final extra = state.extra as Map<String, dynamic>?;
                   final series = extra?['series'] as Series?;
-                  return SeriesDetailScreen(seriesId: id, series: series);
+                  final groupId = extra?['groupId'] as String?;
+                  final groupType = extra?['groupType'] as GroupType?;
+                  final isGroupEnrolled =
+                      extra?['isGroupEnrolled'] as bool? ?? false;
+                  return SeriesDetailScreen(
+                    seriesId: id,
+                    series: series,
+                    groupId: groupId,
+                    groupType: groupType,
+                    isGroupEnrolled: isGroupEnrolled,
+                  );
                 },
                 routes: [
                   GoRoute(

lib/core/l10n/app_bo.arb

@@ -705,6 +705,7 @@
   "group_followers": "རྗེས་འབྲང་པ།",
   "group_links_title": "འབྲེལ་ཐག",
   "group_and_more_links": "དང་འབྲེལ་ཐག་གཞན་ {count}",
+  "group_practice_with_us": "ང་ཚོ་དང་མཉམ་དུ་སྒོམ་གྱི།",
 
   "share_this_quote": "གསུང་ཚིག་འདི་སྤེལ།",
   "shared_from": "སྤེལ་ཁུངས།",

lib/core/l10n/app_en.arb

@@ -782,6 +782,9 @@
   "group_followers": "followers",
   "group_links_title": "Links",
   "group_and_more_links": "and {count} more links",
+  "group_practice_with_us": "Practice with us",
+  "group_change_practice_title": "Change group practice",
+  "group_change_practice_message": "You are already practicing this plan with another group. Would you like to change your practice group?",
   "@group_and_more_links": {
     "placeholders": {
       "count": {

lib/core/l10n/app_hi.arb

@@ -771,6 +771,7 @@
   "group_followers": "अनुयायी",
   "group_links_title": "लिंक",
   "group_and_more_links": "और {count} और लिंक",
+  "group_practice_with_us": "हमारे साथ अभ्यास करें",
 
   "share_this_quote": "यह उद्धरण शेयर करें",
   "shared_from": "यहाँ से शेयर किया गया",

lib/core/l10n/app_mn.arb

@@ -771,6 +771,7 @@
   "group_followers": "дагагчид",
   "group_links_title": "Холбоосууд",
   "group_and_more_links": "болон дахиад {count} холбоос",
+  "group_practice_with_us": "Бидэнтэй хамт дадлага хий",
 
   "share_this_quote": "Энэ ишлэлийг хуваалцах",
   "shared_from": "Хуваалцсан:",

lib/core/l10n/app_ne.arb

@@ -771,6 +771,7 @@
   "group_followers": "अनुयायीहरू",
   "group_links_title": "लिङ्कहरू",
   "group_and_more_links": "र अरू {count} लिङ्कहरू",
+  "group_practice_with_us": "हामीसँग अभ्यास गर्नुहोस्",
 
   "share_this_quote": "यो उद्धरण साझा गर्नुहोस्",
   "shared_from": "बाट साझा गरिएको",

lib/core/l10n/app_zh.arb

@@ -705,6 +705,7 @@
   "group_followers": "位追蹤者",
   "group_links_title": "連結",
   "group_and_more_links": "及另外 {count} 個連結",
+  "group_practice_with_us": "與我們一起修行",
 
   "share_this_quote": "分享这句话",
   "shared_from": "分享自",

lib/core/l10n/generated/app_localizations.dart

@@ -2938,6 +2938,24 @@ abstract class AppLocalizations {
   /// **'and {count} more links'**
   String group_and_more_links(int count);
 
+  /// No description provided for @group_practice_with_us.
+  ///
+  /// In en, this message translates to:
+  /// **'Practice with us'**
+  String get group_practice_with_us;
+
+  /// No description provided for @group_change_practice_title.
+  ///
+  /// In en, this message translates to:
+  /// **'Change group practice'**
+  String get group_change_practice_title;
+
+  /// No description provided for @group_change_practice_message.
+  ///
+  /// In en, this message translates to:
+  /// **'You are already practicing this plan with another group. Would you like to change your practice group?'**
+  String get group_change_practice_message;
+
   /// No description provided for @share_this_quote.
   ///
   /// In en, this message translates to:

lib/core/l10n/generated/app_localizations_bo.dart

@@ -1623,6 +1623,16 @@ class AppLocalizationsBo extends AppLocalizations {
     return 'དང་འབྲེལ་ཐག་གཞན་ $count';
   }
 
+  @override
+  String get group_practice_with_us => 'ང་ཚོ་དང་མཉམ་དུ་སྒོམ་གྱི།';
+
+  @override
+  String get group_change_practice_title => 'Change group practice';
+
+  @override
+  String get group_change_practice_message =>
+      'You are already practicing this plan with another group. Would you like to change your practice group?';
+
   @override
   String get share_this_quote => 'གསུང་ཚིག་འདི་སྤེལ།';