From 70cbd1c87353672d391ae8f409b56cd8394f4009 Mon Sep 17 00:00:00 2001
From: dahoud <41957584+DahoudG@users.noreply.github.com>
Date: Tue, 7 Apr 2026 20:56:03 +0000
Subject: [PATCH] =?UTF-8?q?fix(mobile):=20URL=20changement=20mdp=20corrig?=
=?UTF-8?q?=C3=A9e=20+=20v3.0=20=E2=80=94=20multi-org,=20AppAuth,=20s?=
=?UTF-8?q?=C3=A9curit=C3=A9=20prod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Auth:
- profile_repository.dart: /api/auth/change-password → /api/membres/auth/change-password
Multi-org (Phase 3):
- OrgSelectorPage, OrgSwitcherBloc, OrgSwitcherEntry
- org_context_service.dart: headers X-Active-Organisation-Id + X-Active-Role
Navigation:
- MorePage: navigation conditionnelle par typeOrganisation
- Suppression adaptive_navigation (remplacé par main_navigation_layout)
Auth AppAuth:
- keycloak_webview_auth_service: fixes AppAuth Android
- AuthBloc: gestion REAUTH_REQUIS + premierLoginComplet
Onboarding:
- Nouveaux états: payment_method_page, onboarding_shared_widgets
- SouscriptionStatusModel mis à jour StatutValidationSouscription
Android:
- build.gradle: ProGuard/R8, network_security_config
- Gradle wrapper mis à jour
---
android/app/build.gradle | 7 +-
android/app/src/main/AndroidManifest.xml | 7 -
.../unionflow_mobile_apps/MainActivity.kt | 17 -
.../main/res/xml/network_security_config.xml | 3 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
android/settings.gradle | 4 +-
l10n.yaml | 1 +
lib/app/app.dart | 6 +-
lib/core/di/injection.dart | 2 +-
lib/core/di/injection_container.dart | 2 +-
lib/core/navigation/adaptive_navigation.dart | 563 -----
.../navigation/main_navigation_layout.dart | 30 +-
lib/core/navigation/more_page.dart | 210 +-
lib/core/network/api_client.dart | 10 +-
lib/core/network/org_context_service.dart | 70 +
lib/core/websocket/websocket_service.dart | 43 +-
.../presentation/pages/adhesions_page.dart | 4 +-
.../keycloak_webview_auth_service.dart | 9 +-
.../presentation/bloc/auth_bloc.dart | 51 +-
.../pages/keycloak_webview_auth_page.dart | 555 +----
.../presentation/pages/login_page.dart | 209 +-
.../presentation/bloc/dashboard_bloc.dart | 29 +-
.../pages/connected_dashboard_page.dart | 760 -------
.../role_dashboards/visitor_dashboard.dart | 537 ++---
.../navigation/dashboard_navigation.dart | 416 ----
lib/features/events/bloc/evenements_bloc.dart | 101 +-
lib/features/members/bloc/membres_bloc.dart | 217 +-
lib/features/members/bloc/membres_event.dart | 87 +
lib/features/members/bloc/membres_state.dart | 72 +
.../data/models/membre_complete_model.dart | 35 +-
.../data/models/membre_complete_model.g.dart | 14 +-
.../repositories/membre_repository_impl.dart | 113 +-
.../repositories/membre_repository.dart | 20 +
.../presentation/pages/members_page.dart | 1981 -----------------
.../pages/members_page_connected.dart | 749 +++++--
.../pages/members_page_wrapper.dart | 144 +-
.../widgets/add_member_dialog.dart | 1595 ++++++++++---
.../onboarding/bloc/onboarding_bloc.dart | 61 +-
.../datasources/souscription_datasource.dart | 27 +-
.../models/souscription_status_model.dart | 10 +
.../pages/awaiting_validation_page.dart | 260 ++-
.../pages/onboarding_flow_page.dart | 176 +-
.../pages/onboarding_shared_widgets.dart | 169 ++
.../pages/payment_method_page.dart | 428 ++++
.../pages/period_selection_page.dart | 502 +++--
.../pages/plan_selection_page.dart | 468 ++--
.../pages/subscription_summary_page.dart | 572 ++++-
.../presentation/pages/wave_payment_page.dart | 422 +++-
.../organizations/bloc/org_switcher_bloc.dart | 144 ++
.../data/models/org_switcher_entry.dart | 73 +
.../presentation/pages/org_selector_page.dart | 384 ++++
.../pages/organizations_page.dart | 12 +-
.../data/repositories/profile_repository.dart | 6 +-
.../presentation/pages/profile_page.dart | 27 +
.../pages/profile_page_wrapper.dart | 15 +-
lib/l10n/app_localizations.dart | 1435 ++++++++++++
lib/l10n/app_localizations_en.dart | 673 ++++++
lib/l10n/app_localizations_fr.dart | 674 ++++++
lib/main.dart | 4 +-
.../theme/app_theme_sophisticated.dart | 6 +-
pubspec.lock | 163 +-
pubspec.yaml | 4 +-
.../members/bloc/membres_bloc_test.dart | 48 +
63 files changed, 9316 insertions(+), 6122 deletions(-)
delete mode 100644 lib/core/navigation/adaptive_navigation.dart
create mode 100644 lib/core/network/org_context_service.dart
delete mode 100644 lib/features/dashboard/presentation/pages/connected_dashboard_page.dart
delete mode 100644 lib/features/dashboard/presentation/widgets/navigation/dashboard_navigation.dart
delete mode 100644 lib/features/members/presentation/pages/members_page.dart
create mode 100644 lib/features/onboarding/presentation/pages/onboarding_shared_widgets.dart
create mode 100644 lib/features/onboarding/presentation/pages/payment_method_page.dart
create mode 100644 lib/features/organizations/bloc/org_switcher_bloc.dart
create mode 100644 lib/features/organizations/data/models/org_switcher_entry.dart
create mode 100644 lib/features/organizations/presentation/pages/org_selector_page.dart
create mode 100644 lib/l10n/app_localizations.dart
create mode 100644 lib/l10n/app_localizations_en.dart
create mode 100644 lib/l10n/app_localizations_fr.dart
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3b53302..a20812f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -7,10 +7,11 @@ plugins {
android {
namespace = "dev.lions.unionflow_mobile_apps"
- compileSdk = 35
+ compileSdk = 36
ndkVersion = flutter.ndkVersion
compileOptions {
+ coreLibraryDesugaringEnabled true
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
@@ -53,3 +54,7 @@ android {
flutter {
source = "../.."
}
+
+dependencies {
+ coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
+}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6b2ad5e..0d9c2e3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -34,13 +34,6 @@
-
-
-
-
-
-
-
diff --git a/android/app/src/main/kotlin/dev/lions/unionflow_mobile_apps/MainActivity.kt b/android/app/src/main/kotlin/dev/lions/unionflow_mobile_apps/MainActivity.kt
index 2eb5899..1f4ee59 100644
--- a/android/app/src/main/kotlin/dev/lions/unionflow_mobile_apps/MainActivity.kt
+++ b/android/app/src/main/kotlin/dev/lions/unionflow_mobile_apps/MainActivity.kt
@@ -1,29 +1,12 @@
package dev.lions.unionflow_mobile_apps
import android.content.Intent
-import android.os.Bundle
import io.flutter.embedding.android.FlutterActivity
class MainActivity: FlutterActivity() {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- handleIntent(intent)
- }
-
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent)
- handleIntent(intent)
- }
-
- private fun handleIntent(intent: Intent?) {
- if (intent?.action == Intent.ACTION_VIEW) {
- val data = intent.data
- if (data != null && data.scheme == "dev.lions.unionflow-mobile") {
- // L'intent sera automatiquement traité par flutter_appauth
- android.util.Log.d("MainActivity", "Deep link reçu: $data")
- }
- }
}
}
diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
index b7247b4..f9213f7 100644
--- a/android/app/src/main/res/xml/network_security_config.xml
+++ b/android/app/src/main/res/xml/network_security_config.xml
@@ -9,8 +9,7 @@
- 192.168.1.4
- localhost
+ 192.168.1.9
localhost
10.0.2.2
127.0.0.1
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 3c85cfe..348c409 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index b9e43bd..cb7d7dd 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
- id "com.android.application" version "8.1.0" apply false
- id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+ id "com.android.application" version "8.7.3" apply false
+ id "org.jetbrains.kotlin.android" version "2.1.0" apply false
}
include ":app"
diff --git a/l10n.yaml b/l10n.yaml
index 1363b25..b8c0e90 100644
--- a/l10n.yaml
+++ b/l10n.yaml
@@ -1,4 +1,5 @@
arb-dir: lib/l10n
template-arb-file: app_fr.arb
output-localization-file: app_localizations.dart
+output-dir: lib/l10n
diff --git a/lib/app/app.dart b/lib/app/app.dart
index b4090bb..eed9bbe 100644
--- a/lib/app/app.dart
+++ b/lib/app/app.dart
@@ -7,9 +7,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:provider/provider.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import '../l10n/app_localizations.dart';
import '../shared/design_system/theme/app_theme_sophisticated.dart';
import '../features/authentication/presentation/bloc/auth_bloc.dart';
+import '../features/organizations/bloc/org_switcher_bloc.dart';
import '../core/l10n/locale_provider.dart';
import '../core/theme/theme_provider.dart';
import '../core/di/injection.dart';
@@ -39,6 +40,9 @@ class UnionFlowApp extends StatelessWidget {
BlocProvider(
create: (context) => getIt()..add(const AuthStatusChecked()),
),
+ BlocProvider(
+ create: (context) => getIt(),
+ ),
],
child: Consumer2(
builder: (context, locale, theme, child) {
diff --git a/lib/core/di/injection.dart b/lib/core/di/injection.dart
index 2a2f0ad..dd0ef7c 100644
--- a/lib/core/di/injection.dart
+++ b/lib/core/di/injection.dart
@@ -10,4 +10,4 @@ final GetIt getIt = GetIt.instance;
preferRelativeImports: true, // default
asExtension: true, // default
)
-void configureDependencies() => getIt.init();
+Future configureDependencies() => getIt.init();
diff --git a/lib/core/di/injection_container.dart b/lib/core/di/injection_container.dart
index 619f451..1fc214d 100644
--- a/lib/core/di/injection_container.dart
+++ b/lib/core/di/injection_container.dart
@@ -10,7 +10,7 @@ final GetIt sl = getIt;
/// Initialise toutes les dépendances de l'application
Future initializeDependencies() async {
- configureDependencies();
+ await configureDependencies();
}
/// Nettoie toutes les dépendances (optionnel, pour les tests)
diff --git a/lib/core/navigation/adaptive_navigation.dart b/lib/core/navigation/adaptive_navigation.dart
deleted file mode 100644
index 1e5ad93..0000000
--- a/lib/core/navigation/adaptive_navigation.dart
+++ /dev/null
@@ -1,563 +0,0 @@
-/// Système de navigation adaptatif basé sur les rôles
-/// Navigation qui s'adapte selon les permissions et rôles utilisateurs
-library adaptive_navigation;
-
-import 'package:flutter/material.dart';
-import '../../shared/design_system/tokens/app_colors.dart';
-import '../../shared/design_system/tokens/color_tokens.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../features/authentication/presentation/bloc/auth_bloc.dart';
-import '../../features/authentication/data/models/user_role.dart';
-import '../../features/authentication/data/models/permission_matrix.dart';
-import '../../shared/widgets/adaptive_widget.dart';
-
-/// Élément de navigation adaptatif
-class AdaptiveNavigationItem {
- /// Icône de l'élément
- final IconData icon;
-
- /// Icône sélectionnée (optionnelle)
- final IconData? selectedIcon;
-
- /// Libellé de l'élément
- final String label;
-
- /// Route de destination
- final String route;
-
- /// Permissions requises pour afficher cet élément
- final List requiredPermissions;
-
- /// Rôles minimum requis
- final UserRole? minimumRole;
-
- /// Badge de notification (optionnel)
- final String? badge;
-
- /// Couleur personnalisée (optionnelle)
- final Color? color;
-
- const AdaptiveNavigationItem({
- required this.icon,
- this.selectedIcon,
- required this.label,
- required this.route,
- this.requiredPermissions = const [],
- this.minimumRole,
- this.badge,
- this.color,
- });
-}
-
-/// Drawer de navigation adaptatif
-class AdaptiveNavigationDrawer extends StatelessWidget {
- /// Callback de navigation
- final Function(String route) onNavigate;
-
- /// Callback de déconnexion
- final VoidCallback onLogout;
-
- /// Éléments de navigation personnalisés
- final List? customItems;
-
- const AdaptiveNavigationDrawer({
- super.key,
- required this.onNavigate,
- required this.onLogout,
- this.customItems,
- });
-
- @override
- Widget build(BuildContext context) {
- return AdaptiveWidget(
- roleWidgets: {
- UserRole.superAdmin: () => _buildSuperAdminDrawer(context),
- UserRole.orgAdmin: () => _buildOrgAdminDrawer(context),
- UserRole.moderator: () => _buildModeratorDrawer(context),
- UserRole.activeMember: () => _buildActiveMemberDrawer(context),
- UserRole.simpleMember: () => _buildSimpleMemberDrawer(context),
- UserRole.visitor: () => _buildVisitorDrawer(context),
- },
- fallbackWidget: _buildBasicDrawer(context),
- loadingWidget: _buildLoadingDrawer(context),
- );
- }
-
- /// Drawer pour Super Admin
- Widget _buildSuperAdminDrawer(BuildContext context) {
- final items = [
- const AdaptiveNavigationItem(
- icon: Icons.dashboard,
- label: 'Command Center',
- route: '/dashboard',
- requiredPermissions: [PermissionMatrix.SYSTEM_ADMIN],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.business,
- label: 'Organisations',
- route: '/organizations',
- requiredPermissions: [PermissionMatrix.ORG_CREATE],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.people,
- label: 'Utilisateurs Globaux',
- route: '/global-users',
- requiredPermissions: [PermissionMatrix.MEMBERS_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.settings,
- label: 'Administration',
- route: '/system-admin',
- requiredPermissions: [PermissionMatrix.SYSTEM_CONFIG],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.analytics,
- label: 'Analytics',
- route: '/analytics',
- requiredPermissions: [PermissionMatrix.DASHBOARD_ANALYTICS],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.security,
- label: 'Sécurité',
- route: '/security',
- requiredPermissions: [PermissionMatrix.SYSTEM_SECURITY],
- ),
- ];
-
- return _buildDrawer(
- context,
- 'Super Administrateur',
- AppColors.brandGreen,
- Icons.admin_panel_settings,
- items,
- );
- }
-
- /// Drawer pour Org Admin
- Widget _buildOrgAdminDrawer(BuildContext context) {
- final items = [
- const AdaptiveNavigationItem(
- icon: Icons.dashboard,
- label: 'Control Panel',
- route: '/dashboard',
- requiredPermissions: [PermissionMatrix.DASHBOARD_VIEW],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.people,
- label: 'Membres',
- route: '/members',
- requiredPermissions: [PermissionMatrix.MEMBERS_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.account_balance_wallet,
- label: 'Finances',
- route: '/finances',
- requiredPermissions: [PermissionMatrix.FINANCES_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.event,
- label: 'Événements',
- route: '/events',
- requiredPermissions: [PermissionMatrix.EVENTS_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.volunteer_activism,
- label: 'Solidarité',
- route: '/solidarity',
- requiredPermissions: [PermissionMatrix.SOLIDARITY_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.assessment,
- label: 'Rapports',
- route: '/reports',
- requiredPermissions: [PermissionMatrix.REPORTS_GENERATE],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.settings,
- label: 'Configuration',
- route: '/org-settings',
- requiredPermissions: [PermissionMatrix.ORG_CONFIG],
- ),
- ];
-
- return _buildDrawer(
- context,
- 'Administrateur',
- AppColors.primaryGreen,
- Icons.business_center,
- items,
- );
- }
-
- /// Drawer pour Modérateur
- Widget _buildModeratorDrawer(BuildContext context) {
- final items = [
- const AdaptiveNavigationItem(
- icon: Icons.dashboard,
- label: 'Management Hub',
- route: '/dashboard',
- requiredPermissions: [PermissionMatrix.DASHBOARD_VIEW],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.gavel,
- label: 'Modération',
- route: '/moderation',
- requiredPermissions: [PermissionMatrix.MODERATION_CONTENT],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.people,
- label: 'Membres',
- route: '/members',
- requiredPermissions: [PermissionMatrix.MEMBERS_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.event,
- label: 'Événements',
- route: '/events',
- requiredPermissions: [PermissionMatrix.EVENTS_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.message,
- label: 'Communication',
- route: '/communication',
- requiredPermissions: [PermissionMatrix.COMM_MODERATE],
- ),
- ];
-
- return _buildDrawer(
- context,
- 'Modérateur',
- ColorTokens.secondaryDark,
- Icons.manage_accounts,
- items,
- );
- }
-
- /// Drawer pour Membre Actif
- Widget _buildActiveMemberDrawer(BuildContext context) {
- final items = [
- const AdaptiveNavigationItem(
- icon: Icons.dashboard,
- label: 'Activity Center',
- route: '/dashboard',
- requiredPermissions: [PermissionMatrix.DASHBOARD_VIEW],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.person,
- label: 'Mon Profil',
- route: '/profile',
- requiredPermissions: [PermissionMatrix.MEMBERS_VIEW_OWN],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.event,
- label: 'Événements',
- route: '/events',
- requiredPermissions: [PermissionMatrix.EVENTS_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.volunteer_activism,
- label: 'Solidarité',
- route: '/solidarity',
- requiredPermissions: [PermissionMatrix.SOLIDARITY_VIEW_ALL],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.payment,
- label: 'Mes Cotisations',
- route: '/my-finances',
- requiredPermissions: [PermissionMatrix.FINANCES_VIEW_OWN],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.message,
- label: 'Messages',
- route: '/messages',
- requiredPermissions: [PermissionMatrix.DASHBOARD_VIEW],
- ),
- ];
-
- return _buildDrawer(
- context,
- 'Membre Actif',
- AppColors.brandGreenLight,
- Icons.groups,
- items,
- );
- }
-
- /// Drawer pour Membre Simple
- Widget _buildSimpleMemberDrawer(BuildContext context) {
- final items = [
- const AdaptiveNavigationItem(
- icon: Icons.dashboard,
- label: 'Mon Espace',
- route: '/dashboard',
- requiredPermissions: [PermissionMatrix.DASHBOARD_VIEW],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.person,
- label: 'Mon Profil',
- route: '/profile',
- requiredPermissions: [PermissionMatrix.MEMBERS_VIEW_OWN],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.event,
- label: 'Événements',
- route: '/events',
- requiredPermissions: [PermissionMatrix.EVENTS_VIEW_PUBLIC],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.payment,
- label: 'Mes Cotisations',
- route: '/my-finances',
- requiredPermissions: [PermissionMatrix.FINANCES_VIEW_OWN],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.help,
- label: 'Aide',
- route: '/help',
- requiredPermissions: [],
- ),
- ];
-
- return _buildDrawer(
- context,
- 'Membre',
- ColorTokens.secondary,
- Icons.person,
- items,
- );
- }
-
- /// Drawer pour Visiteur
- Widget _buildVisitorDrawer(BuildContext context) {
- final items = [
- const AdaptiveNavigationItem(
- icon: Icons.home,
- label: 'Accueil',
- route: '/dashboard',
- requiredPermissions: [],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.info,
- label: 'À Propos',
- route: '/about',
- requiredPermissions: [],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.event,
- label: 'Événements Publics',
- route: '/public-events',
- requiredPermissions: [PermissionMatrix.EVENTS_VIEW_PUBLIC],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.contact_mail,
- label: 'Contact',
- route: '/contact',
- requiredPermissions: [],
- ),
- const AdaptiveNavigationItem(
- icon: Icons.login,
- label: 'Se Connecter',
- route: '/login',
- requiredPermissions: [],
- ),
- ];
-
- return _buildDrawer(
- context,
- 'Visiteur',
- AppColors.brandMint,
- Icons.waving_hand,
- items,
- );
- }
-
- /// Drawer basique de fallback
- Widget _buildBasicDrawer(BuildContext context) {
- return _buildDrawer(
- context,
- 'UnionFlow',
- AppColors.textSecondaryLight,
- Icons.dashboard,
- [
- const AdaptiveNavigationItem(
- icon: Icons.home,
- label: 'Accueil',
- route: '/dashboard',
- ),
- ],
- );
- }
-
- /// Drawer de chargement
- Widget _buildLoadingDrawer(BuildContext context) {
- return Drawer(
- child: Container(
- decoration: const BoxDecoration(
- gradient: LinearGradient(
- begin: Alignment.topCenter,
- end: Alignment.bottomCenter,
- colors: [AppColors.brandGreen, AppColors.primaryGreen],
- ),
- ),
- child: const Center(
- child: CircularProgressIndicator(
- valueColor: AlwaysStoppedAnimation(Colors.white),
- ),
- ),
- ),
- );
- }
-
- /// Construit un drawer avec les éléments spécifiés
- Widget _buildDrawer(
- BuildContext context,
- String title,
- Color color,
- IconData icon,
- List items,
- ) {
- return Drawer(
- child: Column(
- children: [
- // En-tête du drawer
- _buildDrawerHeader(context, title, color, icon),
-
- // Éléments de navigation
- Expanded(
- child: ListView(
- padding: EdgeInsets.zero,
- children: [
- ...items.map((item) => _buildNavigationItem(context, item)),
- const Divider(),
- _buildLogoutItem(context),
- ],
- ),
- ),
- ],
- ),
- );
- }
-
- /// Construit l'en-tête du drawer
- Widget _buildDrawerHeader(
- BuildContext context,
- String title,
- Color color,
- IconData icon,
- ) {
- return DrawerHeader(
- decoration: BoxDecoration(
- gradient: LinearGradient(
- begin: Alignment.topLeft,
- end: Alignment.bottomRight,
- colors: [color, color.withOpacity(0.8)],
- ),
- ),
- child: BlocBuilder(
- builder: (context, state) {
- if (state is AuthAuthenticated) {
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Row(
- children: [
- Icon(icon, color: Colors.white, size: 32),
- const SizedBox(width: 12),
- Text(
- title,
- style: const TextStyle(
- color: Colors.white,
- fontSize: 20,
- fontWeight: FontWeight.bold,
- ),
- ),
- ],
- ),
- const SizedBox(height: 16),
- Text(
- state.user.fullName,
- style: const TextStyle(
- color: Colors.white,
- fontSize: 16,
- ),
- ),
- Text(
- state.user.email,
- style: TextStyle(
- color: Colors.white.withOpacity(0.8),
- fontSize: 14,
- ),
- ),
- ],
- );
- }
-
- return Row(
- children: [
- Icon(icon, color: Colors.white, size: 32),
- const SizedBox(width: 12),
- Text(
- title,
- style: const TextStyle(
- color: Colors.white,
- fontSize: 20,
- fontWeight: FontWeight.bold,
- ),
- ),
- ],
- );
- },
- ),
- );
- }
-
- /// Construit un élément de navigation
- Widget _buildNavigationItem(
- BuildContext context,
- AdaptiveNavigationItem item,
- ) {
- return SecureWidget(
- requiredPermissions: item.requiredPermissions,
- child: ListTile(
- leading: Icon(item.icon, color: item.color),
- title: Text(item.label),
- trailing: item.badge != null
- ? Container(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
- decoration: BoxDecoration(
- color: AppColors.error,
- borderRadius: BorderRadius.circular(12),
- ),
- child: Text(
- item.badge!,
- style: const TextStyle(
- color: Colors.white,
- fontSize: 12,
- fontWeight: FontWeight.bold,
- ),
- ),
- )
- : null,
- onTap: () {
- Navigator.of(context).pop();
- onNavigate(item.route);
- },
- ),
- );
- }
-
- /// Construit l'élément de déconnexion
- Widget _buildLogoutItem(BuildContext context) {
- return ListTile(
- leading: Icon(Icons.logout, color: AppColors.error),
- title: const Text(
- 'Déconnexion',
- style: TextStyle(color: AppColors.error),
- ),
- onTap: () {
- Navigator.of(context).pop();
- onLogout();
- },
- );
- }
-}
diff --git a/lib/core/navigation/main_navigation_layout.dart b/lib/core/navigation/main_navigation_layout.dart
index 617cad2..f8e13d8 100644
--- a/lib/core/navigation/main_navigation_layout.dart
+++ b/lib/core/navigation/main_navigation_layout.dart
@@ -31,6 +31,10 @@ class _MainNavigationLayoutState extends State {
String? _lastOrgId;
Widget _getDashboardForRole(UserRole role, String userId, String? orgId) {
+ // Compte sans rôle métier — afficher la page d'attente sans appel API
+ if (role == UserRole.visitor) {
+ return const VisitorDashboard();
+ }
if (role == UserRole.orgAdmin && (orgId == null || orgId.isEmpty)) {
return OrgAdminDashboardLoader(userId: userId);
}
@@ -83,8 +87,8 @@ class _MainNavigationLayoutState extends State {
MembersPageWrapper(
organisationId: role == UserRole.orgAdmin ? orgId : null,
),
- const EventsPageWrapper(),
- const MorePage(),
+ if (role != UserRole.visitor) const EventsPageWrapper(),
+ if (role != UserRole.visitor) const MorePage(),
];
return _cachedPages!;
}
@@ -150,16 +154,18 @@ class _MainNavigationLayoutState extends State {
activeIcon: Icons.people_rounded,
label: 'Membres',
),
- const _NavItem(
- icon: Icons.event_outlined,
- activeIcon: Icons.event_rounded,
- label: 'Événements',
- ),
- const _NavItem(
- icon: Icons.more_horiz_rounded,
- activeIcon: Icons.more_horiz_rounded,
- label: 'Plus',
- ),
+ if (role != UserRole.visitor) ...[
+ const _NavItem(
+ icon: Icons.event_outlined,
+ activeIcon: Icons.event_rounded,
+ label: 'Événements',
+ ),
+ const _NavItem(
+ icon: Icons.more_horiz_rounded,
+ activeIcon: Icons.more_horiz_rounded,
+ label: 'Plus',
+ ),
+ ],
];
}
}
diff --git a/lib/core/navigation/more_page.dart b/lib/core/navigation/more_page.dart
index 4c312ca..54e49dd 100644
--- a/lib/core/navigation/more_page.dart
+++ b/lib/core/navigation/more_page.dart
@@ -5,6 +5,8 @@ import '../../features/authentication/data/models/user_role.dart';
import '../../shared/design_system/unionflow_design_system.dart';
import '../../shared/widgets/core_card.dart';
import '../../shared/widgets/mini_avatar.dart';
+import '../di/injection_container.dart';
+import '../network/org_context_service.dart';
import '../../features/admin/presentation/pages/user_management_page.dart';
import '../../features/settings/presentation/pages/system_settings_page.dart';
@@ -12,18 +14,22 @@ import '../../features/backup/presentation/pages/backup_page.dart';
import '../../features/logs/presentation/pages/logs_page.dart';
import '../../features/reports/presentation/pages/reports_page_wrapper.dart';
import '../../features/epargne/presentation/pages/epargne_page.dart';
-import '../../features/contributions/presentation/pages/contributions_page_wrapper.dart';
+import '../../features/contributions/presentation/pages/contributions_page_wrapper.dart' show CotisationsPageWrapper;
import '../../features/adhesions/presentation/pages/adhesions_page_wrapper.dart';
import '../../features/solidarity/presentation/pages/demandes_aide_page_wrapper.dart';
import '../../features/organizations/presentation/pages/organizations_page_wrapper.dart';
+import '../../features/organizations/presentation/pages/org_selector_page.dart';
+import '../../features/organizations/bloc/org_switcher_bloc.dart';
import '../../features/profile/presentation/pages/profile_page_wrapper.dart';
-/// Page "Plus" avec les fonctions avancées selon le rôle
+/// Page "Plus" avec les fonctions avancées selon le rôle et les modules actifs.
class MorePage extends StatelessWidget {
const MorePage({super.key});
@override
Widget build(BuildContext context) {
+ final orgCtx = sl();
+
return BlocBuilder(
builder: (context, state) {
if (state is! AuthAuthenticated) {
@@ -43,11 +49,12 @@ class MorePage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- _buildUserProfile(context, state),
+ _buildUserProfile(context, state, orgCtx),
const SizedBox(height: SpacingTokens.md),
- ..._buildRoleBasedOptions(context, state),
+ ..._buildRoleBasedOptions(context, state, orgCtx),
+ ..._buildModuleOptions(context, state, orgCtx),
const SizedBox(height: SpacingTokens.md),
- ..._buildCommonOptions(context),
+ ..._buildCommonOptions(context, orgCtx),
],
),
),
@@ -56,7 +63,8 @@ class MorePage extends StatelessWidget {
);
}
- Widget _buildUserProfile(BuildContext context, AuthAuthenticated state) {
+ Widget _buildUserProfile(
+ BuildContext context, AuthAuthenticated state, OrgContextService orgCtx) {
final isDark = Theme.of(context).brightness == Brightness.dark;
final textColor = isDark ? AppColors.textPrimaryDark : AppColors.textPrimaryLight;
final roleColor = isDark ? AppColors.brandGreenLight : AppColors.primaryGreen;
@@ -90,6 +98,10 @@ class MorePage extends StatelessWidget {
fontWeight: FontWeight.bold,
),
),
+ if (orgCtx.hasContext) ...[
+ const SizedBox(height: 4),
+ _OrgBadge(orgCtx: orgCtx, onTap: () => _openOrgSelector(context)),
+ ],
],
),
),
@@ -101,7 +113,20 @@ class MorePage extends StatelessWidget {
);
}
- List _buildRoleBasedOptions(BuildContext context, AuthAuthenticated state) {
+ void _openOrgSelector(BuildContext context) {
+ // Vérifier que OrgSwitcherBloc est disponible (fourni par un ancêtre)
+ try {
+ showOrgSelector(context);
+ } catch (_) {
+ // OrgSwitcherBloc pas fourni dans ce contexte, navigation vers ProfilePage
+ Navigator.of(context).push(
+ MaterialPageRoute(builder: (_) => const ProfilePageWrapper()),
+ );
+ }
+ }
+
+ List _buildRoleBasedOptions(
+ BuildContext context, AuthAuthenticated state, OrgContextService orgCtx) {
final options = [];
if (state.effectiveRole == UserRole.superAdmin) {
@@ -195,7 +220,115 @@ class MorePage extends StatelessWidget {
return options;
}
- List _buildCommonOptions(BuildContext context) {
+ /// Sections de modules métier — visibles uniquement si le module est actif.
+ List _buildModuleOptions(
+ BuildContext context, AuthAuthenticated state, OrgContextService orgCtx) {
+ final options = [];
+ final isAdmin = state.effectiveRole == UserRole.orgAdmin ||
+ state.effectiveRole == UserRole.superAdmin;
+
+ // Module TONTINE
+ if (orgCtx.isModuleActif('TONTINE')) {
+ options.add(_buildSectionTitle(context, 'Tontine'));
+ if (isAdmin) {
+ options.add(_buildOptionTile(context,
+ icon: Icons.autorenew,
+ title: 'Gestion Tontine',
+ subtitle: 'Cycles, cotisations et remises',
+ onTap: () => Navigator.pushNamed(context, '/tontine'),
+ ));
+ } else {
+ options.add(_buildOptionTile(context,
+ icon: Icons.autorenew,
+ title: 'Ma Tontine',
+ subtitle: 'Mes cycles et cotisations',
+ onTap: () => Navigator.pushNamed(context, '/tontine'),
+ ));
+ }
+ }
+
+ // Module EPARGNE
+ if (orgCtx.isModuleActif('EPARGNE')) {
+ options.add(_buildSectionTitle(context, 'Épargne'));
+ options.add(_buildOptionTile(context,
+ icon: Icons.savings,
+ title: isAdmin ? 'Gestion Épargne' : 'Mon Épargne',
+ subtitle: isAdmin ? 'Comptes épargne et transactions' : 'Mon compte épargne',
+ onTap: () => Navigator.of(context).push(
+ MaterialPageRoute(builder: (_) => const EpargnePage())),
+ ));
+ }
+
+ // Module CREDIT
+ if (orgCtx.isModuleActif('CREDIT')) {
+ options.add(_buildSectionTitle(context, 'Crédit'));
+ options.add(_buildOptionTile(context,
+ icon: Icons.account_balance,
+ title: isAdmin ? 'Gestion Crédit' : 'Mon Crédit',
+ subtitle: isAdmin ? 'Demandes et suivi des crédits' : 'Mes demandes de crédit',
+ onTap: () => Navigator.pushNamed(context, '/credit'),
+ ));
+ }
+
+ // Module AGRICULTURE
+ if (orgCtx.isModuleActif('AGRICULTURE')) {
+ options.add(_buildSectionTitle(context, 'Agriculture'));
+ options.add(_buildOptionTile(context,
+ icon: Icons.eco,
+ title: 'Campagnes Agricoles',
+ subtitle: 'Parcelles, récoltes et stocks',
+ onTap: () => Navigator.pushNamed(context, '/agricole'),
+ ));
+ }
+
+ // Module COLLECTE_FONDS
+ if (orgCtx.isModuleActif('COLLECTE_FONDS')) {
+ options.add(_buildSectionTitle(context, 'Collecte de Fonds'));
+ options.add(_buildOptionTile(context,
+ icon: Icons.volunteer_activism,
+ title: 'Campagnes de Collecte',
+ subtitle: 'Dons et levées de fonds',
+ onTap: () => Navigator.pushNamed(context, '/collecte'),
+ ));
+ }
+
+ // Module PROJETS_ONG
+ if (orgCtx.isModuleActif('PROJETS_ONG')) {
+ options.add(_buildSectionTitle(context, 'Projets ONG'));
+ options.add(_buildOptionTile(context,
+ icon: Icons.public,
+ title: 'Projets',
+ subtitle: 'Gérer et suivre les projets',
+ onTap: () => Navigator.pushNamed(context, '/projets-ong'),
+ ));
+ }
+
+ // Module CULTE_DONS
+ if (orgCtx.isModuleActif('CULTE_DONS')) {
+ options.add(_buildSectionTitle(context, 'Culte & Dons'));
+ options.add(_buildOptionTile(context,
+ icon: Icons.church,
+ title: 'Dons et Offrandes',
+ subtitle: 'Gestion des dons religieux',
+ onTap: () => Navigator.pushNamed(context, '/culte'),
+ ));
+ }
+
+ // Module VOTES
+ if (orgCtx.isModuleActif('VOTES')) {
+ options.add(_buildSectionTitle(context, 'Votes'));
+ options.add(_buildOptionTile(context,
+ icon: Icons.how_to_vote,
+ title: 'Votes & Élections',
+ subtitle: 'Campagnes et résultats',
+ onTap: () => Navigator.pushNamed(context, '/votes'),
+ ));
+ }
+
+ return options;
+ }
+
+ List _buildCommonOptions(BuildContext context, OrgContextService orgCtx) {
return [
_buildSectionTitle(context, 'Général'),
_buildOptionTile(context,
@@ -219,17 +352,20 @@ class MorePage extends StatelessWidget {
onTap: () => Navigator.of(context).push(
MaterialPageRoute(builder: (_) => const DemandesAidePageWrapper())),
),
- _buildOptionTile(context,
- icon: Icons.savings_outlined,
- title: 'Comptes épargne',
- subtitle: 'Mutuelle épargne – dépôts (LCB-FT)',
- onTap: () => Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => const EpargnePage())),
- ),
+ // Épargne — affiché en commun uniquement si le module n'est PAS actif (évite doublon avec section module)
+ if (!orgCtx.isModuleActif('EPARGNE'))
+ _buildOptionTile(context,
+ icon: Icons.savings_outlined,
+ title: 'Comptes épargne',
+ subtitle: 'Mutuelle épargne – dépôts (LCB-FT)',
+ onTap: () => Navigator.of(context).push(
+ MaterialPageRoute(builder: (_) => const EpargnePage())),
+ ),
];
}
Widget _buildSectionTitle(BuildContext context, String title) {
+
final isDark = Theme.of(context).brightness == Brightness.dark;
return Padding(
padding: const EdgeInsets.only(top: 16, bottom: 6, left: 4),
@@ -252,6 +388,7 @@ class MorePage extends StatelessWidget {
required VoidCallback onTap,
Color? accentColor,
}) {
+
final isDark = Theme.of(context).brightness == Brightness.dark;
final accent = accentColor ?? AppColors.primaryGreen;
final titleColor = accentColor != null
@@ -297,3 +434,46 @@ class MorePage extends StatelessWidget {
);
}
}
+
+/// Badge compact affichant l'organisation active avec bouton de changement.
+class _OrgBadge extends StatelessWidget {
+ final OrgContextService orgCtx;
+ final VoidCallback onTap;
+
+ const _OrgBadge({required this.orgCtx, required this.onTap});
+
+ @override
+ Widget build(BuildContext context) {
+ final colorScheme = Theme.of(context).colorScheme;
+ return GestureDetector(
+ onTap: onTap,
+ child: Container(
+ padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+ decoration: BoxDecoration(
+ color: colorScheme.primaryContainer.withValues(alpha: 0.4),
+ borderRadius: BorderRadius.circular(12),
+ ),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Icon(Icons.business, size: 12, color: colorScheme.primary),
+ const SizedBox(width: 4),
+ Flexible(
+ child: Text(
+ orgCtx.activeOrganisationNom ?? '—',
+ style: TextStyle(
+ fontSize: 11,
+ color: colorScheme.primary,
+ fontWeight: FontWeight.w600,
+ ),
+ overflow: TextOverflow.ellipsis,
+ ),
+ ),
+ const SizedBox(width: 2),
+ Icon(Icons.swap_horiz, size: 12, color: colorScheme.primary),
+ ],
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/core/network/api_client.dart b/lib/core/network/api_client.dart
index 76ed685..e4a5065 100644
--- a/lib/core/network/api_client.dart
+++ b/lib/core/network/api_client.dart
@@ -10,18 +10,19 @@ import '../error/error_handler.dart';
import '../utils/logger.dart';
import '../../features/authentication/presentation/bloc/auth_bloc.dart';
import '../../features/authentication/data/datasources/keycloak_auth_service.dart';
+import 'org_context_service.dart';
/// Client réseau unifié basé sur Dio (Version DRY & Minimaliste).
@lazySingleton
class ApiClient {
late final Dio _dio;
-
+
static const FlutterSecureStorage _storage = FlutterSecureStorage(
aOptions: AndroidOptions(encryptedSharedPreferences: true),
iOptions: IOSOptions(accessibility: KeychainAccessibility.first_unlock_this_device),
);
- ApiClient() {
+ ApiClient(OrgContextService orgContextService) {
_dio = Dio(
BaseOptions(
baseUrl: AppConfig.apiBaseUrl,
@@ -53,6 +54,11 @@ class ApiClient {
if (token != null) {
options.headers['Authorization'] = 'Bearer $token';
}
+ // Injecter l'organisation active si disponible
+ if (orgContextService.hasContext) {
+ options.headers[OrgContextService.headerName] =
+ orgContextService.activeOrganisationId;
+ }
return handler.next(options);
},
onError: (DioException e, handler) async {
diff --git a/lib/core/network/org_context_service.dart b/lib/core/network/org_context_service.dart
new file mode 100644
index 0000000..5f3f239
--- /dev/null
+++ b/lib/core/network/org_context_service.dart
@@ -0,0 +1,70 @@
+/// Service singleton qui maintient le contexte d'organisation actif.
+///
+/// Injecté dans [ApiClient] pour ajouter automatiquement le header
+/// [X-Active-Organisation-Id] à chaque requête backend.
+library org_context_service;
+
+import 'package:injectable/injectable.dart';
+import '../utils/logger.dart';
+
+const _kHeaderActiveOrg = 'X-Active-Organisation-Id';
+
+@lazySingleton
+class OrgContextService {
+ String? _activeOrganisationId;
+ String? _activeOrganisationNom;
+ String? _activeOrganisationType;
+ Set _modulesActifs = {};
+
+ /// L'UUID de l'organisation active (null si non sélectionnée).
+ String? get activeOrganisationId => _activeOrganisationId;
+
+ /// Le nom lisible de l'organisation active.
+ String? get activeOrganisationNom => _activeOrganisationNom;
+
+ /// Le type de l'organisation active (ex: ASSOCIATION, TONTINE...).
+ String? get activeOrganisationType => _activeOrganisationType;
+
+ /// Modules actifs de l'organisation active (en majuscules).
+ Set get modulesActifs => Set.unmodifiable(_modulesActifs);
+
+ /// Nom du header HTTP utilisé par le backend.
+ static const String headerName = _kHeaderActiveOrg;
+
+ /// Indique si un contexte est disponible.
+ bool get hasContext => _activeOrganisationId != null;
+
+ /// Vérifie si un module spécifique est actif.
+ bool isModuleActif(String module) =>
+ _modulesActifs.contains(module.toUpperCase());
+
+ /// Définit l'organisation active.
+ void setActiveOrganisation({
+ required String organisationId,
+ required String nom,
+ String? type,
+ String? modulesActifsCsv,
+ }) {
+ _activeOrganisationId = organisationId;
+ _activeOrganisationNom = nom;
+ _activeOrganisationType = type;
+ _modulesActifs = _parseModules(modulesActifsCsv);
+ AppLogger.info(
+ 'OrgContextService: organisation active → $nom ($organisationId)'
+ ' | modules: $_modulesActifs');
+ }
+
+ /// Réinitialise le contexte (ex: à la déconnexion).
+ void clear() {
+ _activeOrganisationId = null;
+ _activeOrganisationNom = null;
+ _activeOrganisationType = null;
+ _modulesActifs = {};
+ AppLogger.info('OrgContextService: contexte org effacé');
+ }
+
+ Set _parseModules(String? csv) {
+ if (csv == null || csv.isEmpty) return {};
+ return csv.split(',').map((m) => m.trim().toUpperCase()).toSet();
+ }
+}
diff --git a/lib/core/websocket/websocket_service.dart b/lib/core/websocket/websocket_service.dart
index 3988348..db26673 100644
--- a/lib/core/websocket/websocket_service.dart
+++ b/lib/core/websocket/websocket_service.dart
@@ -25,8 +25,10 @@ abstract class WebSocketEvent {
factory WebSocketEvent.fromJson(Map json) {
final eventType = json['eventType'] as String;
- final timestamp = DateTime.parse(json['timestamp'] as String);
- final data = json['data'] as Map;
+ final timestamp = json['timestamp'] != null
+ ? DateTime.parse(json['timestamp'] as String)
+ : DateTime.now();
+ final data = (json['data'] as Map?) ?? {};
switch (eventType) {
case 'APPROVAL_PENDING':
@@ -242,6 +244,26 @@ class WebSocketService {
return '$baseUrl/ws/dashboard';
}
+ // ─────────────────────────────────────────────────────────────────────────
+ // Helpers de conversion de types (Flutter Web / dart2js compatibility)
+ // ─────────────────────────────────────────────────────────────────────────
+
+ /// Convertit récursivement un objet JSON (potentiellement JS) en types Dart natifs.
+ /// Nécessaire sur Flutter Web où jsonDecode peut retourner des LegacyJavaScriptObject.
+ static dynamic _toDart(dynamic value) {
+ if (value is Map) {
+ return Map.fromEntries(
+ (value as Map).entries.map(
+ (e) => MapEntry(e.key.toString(), _toDart(e.value)),
+ ),
+ );
+ }
+ if (value is List) {
+ return (value as List).map(_toDart).toList();
+ }
+ return value;
+ }
+
/// Gestion des messages reçus
void _onMessage(dynamic message) {
try {
@@ -249,12 +271,25 @@ class WebSocketService {
AppLogger.debug('WebSocket message reçu: $message');
}
- final json = jsonDecode(message as String) as Map;
+ // Sur Flutter Web (web_socket_channel ^3.0.x avec package:web), les messages
+ // text peuvent arriver comme JSString/LegacyJavaScriptObject plutôt que String.
+ // toString() fonctionne pour les strings JS primitifs.
+ final String rawMessage = message is String ? message : message.toString();
+ if (rawMessage.isEmpty) return;
+
+ // Convertir en types Dart natifs pour éviter les LegacyJavaScriptObject imbriqués
+ final dynamic decoded = jsonDecode(rawMessage);
+ if (decoded is! Map) {
+ AppLogger.warning('WebSocket: message ignoré (non-objet): type=${decoded.runtimeType}');
+ return;
+ }
+ final json = _toDart(decoded) as Map;
final type = json['type'] as String?;
// Gérer les messages système
if (type == 'connected') {
- AppLogger.info('🔗 WebSocket: ${json['data']['message']}');
+ final connectedMsg = (json['data'] as Map?)?['message'] ?? 'WebSocket connecté';
+ AppLogger.info('🔗 WebSocket: $connectedMsg');
return;
}
diff --git a/lib/features/adhesions/presentation/pages/adhesions_page.dart b/lib/features/adhesions/presentation/pages/adhesions_page.dart
index 6cacd4b..8f1839e 100644
--- a/lib/features/adhesions/presentation/pages/adhesions_page.dart
+++ b/lib/features/adhesions/presentation/pages/adhesions_page.dart
@@ -80,7 +80,9 @@ class _AdhesionsPageState extends State
action: SnackBarAction(
label: 'Réessayer',
textColor: Colors.white,
- onPressed: () => _loadTab(_tabController.index),
+ onPressed: () {
+ if (mounted) _loadTab(_tabController.index);
+ },
),
),
);
diff --git a/lib/features/authentication/data/datasources/keycloak_webview_auth_service.dart b/lib/features/authentication/data/datasources/keycloak_webview_auth_service.dart
index ed344ad..1c80bcb 100644
--- a/lib/features/authentication/data/datasources/keycloak_webview_auth_service.dart
+++ b/lib/features/authentication/data/datasources/keycloak_webview_auth_service.dart
@@ -126,10 +126,11 @@ class KeycloakWebViewAuthService {
),
);
- // Clés de stockage sécurisé
- static const String _accessTokenKey = 'keycloak_webview_access_token';
- static const String _idTokenKey = 'keycloak_webview_id_token';
- static const String _refreshTokenKey = 'keycloak_webview_refresh_token';
+ // Clés de stockage sécurisé — alignées avec KeycloakAuthService pour éviter IC-03
+ // KeycloakAuthService lit 'kc_access' / 'kc_refresh' / 'kc_id' ; ApiClient aussi.
+ static const String _accessTokenKey = 'kc_access';
+ static const String _idTokenKey = 'kc_id';
+ static const String _refreshTokenKey = 'kc_refresh';
static const String _userInfoKey = 'keycloak_webview_user_info';
static const String _authStateKey = 'keycloak_webview_auth_state';
diff --git a/lib/features/authentication/presentation/bloc/auth_bloc.dart b/lib/features/authentication/presentation/bloc/auth_bloc.dart
index 907a2fb..9c4dc65 100644
--- a/lib/features/authentication/presentation/bloc/auth_bloc.dart
+++ b/lib/features/authentication/presentation/bloc/auth_bloc.dart
@@ -6,6 +6,7 @@ import '../../data/models/user_role.dart';
import '../../data/datasources/keycloak_auth_service.dart';
import '../../data/datasources/permission_engine.dart';
import '../../../../core/config/environment.dart';
+import '../../../../core/network/org_context_service.dart';
import '../../../../core/storage/dashboard_cache_manager.dart';
import '../../../../core/utils/logger.dart';
import '../../../../core/di/injection.dart';
@@ -87,16 +88,32 @@ class AuthPendingOnboarding extends AuthState {
List get props => [onboardingState, souscriptionId, organisationId, typeOrganisation];
}
+// Nouvel événement : auto-select l'org active après login (pour membres mono-org)
+class AuthOrgContextInitRequested extends AuthEvent {
+ final String organisationId;
+ final String organisationNom;
+ final String? type;
+ const AuthOrgContextInitRequested({
+ required this.organisationId,
+ required this.organisationNom,
+ this.type,
+ });
+ @override
+ List get props => [organisationId, organisationNom, type];
+}
+
// === BLOC ===
@lazySingleton
class AuthBloc extends Bloc {
final KeycloakAuthService _authService;
+ final OrgContextService _orgContextService;
- AuthBloc(this._authService) : super(AuthInitial()) {
+ AuthBloc(this._authService, this._orgContextService) : super(AuthInitial()) {
on(_onLoginRequested);
on(_onLogoutRequested);
on(_onStatusChecked);
on(_onTokenRefreshRequested);
+ on(_onOrgContextInit);
}
Future _onLoginRequested(AuthLoginRequested event, Emitter emit) async {
@@ -185,9 +202,22 @@ class AuthBloc extends Bloc {
emit(AuthLoading());
await _authService.logout();
await DashboardCacheManager.clear();
+ _orgContextService.clear();
emit(AuthUnauthenticated());
}
+ Future _onOrgContextInit(
+ AuthOrgContextInitRequested event,
+ Emitter emit,
+ ) async {
+ _orgContextService.setActiveOrganisation(
+ organisationId: event.organisationId,
+ nom: event.organisationNom,
+ type: event.type,
+ );
+ AppLogger.info('AuthBloc: contexte org initialisé → ${event.organisationNom}');
+ }
+
Future _onStatusChecked(AuthStatusChecked event, Emitter emit) async {
final tokenValid = await _authService.getValidToken();
final isAuth = tokenValid != null;
@@ -276,9 +306,18 @@ class AuthBloc extends Bloc {
///
/// Si le rôle est [UserRole.orgAdmin] et que [organizationContexts] est vide,
/// appelle GET /api/organisations/mes pour récupérer les organisations de l'admin.
+ /// Auto-initialise [OrgContextService] si une seule organisation.
Future _enrichUserWithOrgContext(User user) async {
if (user.primaryRole != UserRole.orgAdmin ||
user.organizationContexts.isNotEmpty) {
+ // Auto-select le premier contexte existant si pas encore de contexte actif
+ if (!_orgContextService.hasContext && user.organizationContexts.isNotEmpty) {
+ final first = user.organizationContexts.first;
+ _orgContextService.setActiveOrganisation(
+ organisationId: first.organizationId,
+ nom: first.organizationName,
+ );
+ }
return user;
}
try {
@@ -296,7 +335,15 @@ class AuthBloc extends Bloc {
),
)
.toList();
- return contexts.isEmpty ? user : user.copyWith(organizationContexts: contexts);
+ if (contexts.isEmpty) return user;
+ // Auto-select si une seule organisation
+ if (contexts.length == 1 && !_orgContextService.hasContext) {
+ _orgContextService.setActiveOrganisation(
+ organisationId: contexts.first.organizationId,
+ nom: contexts.first.organizationName,
+ );
+ }
+ return user.copyWith(organizationContexts: contexts);
} catch (e) {
AppLogger.warning('AuthBloc: impossible de charger le contexte org: $e');
return user;
diff --git a/lib/features/authentication/presentation/pages/keycloak_webview_auth_page.dart b/lib/features/authentication/presentation/pages/keycloak_webview_auth_page.dart
index ad42e74..4406dc6 100644
--- a/lib/features/authentication/presentation/pages/keycloak_webview_auth_page.dart
+++ b/lib/features/authentication/presentation/pages/keycloak_webview_auth_page.dart
@@ -1,327 +1,121 @@
/// Page d'Authentification UnionFlow
///
-/// Interface utilisateur pour la connexion sécurisée
-/// avec gestion complète des états et des erreurs.
+/// Interface utilisateur pour la connexion sécurisée via AppAuth (RFC 8252).
library keycloak_webview_auth_page;
-import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:webview_flutter/webview_flutter.dart';
-import '../../data/datasources/keycloak_webview_auth_service.dart';
+import 'package:flutter_appauth/flutter_appauth.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:jwt_decoder/jwt_decoder.dart';
+import '../../data/datasources/keycloak_auth_service.dart';
+import '../../data/datasources/keycloak_role_mapper.dart';
import '../../data/models/user.dart';
import '../../../../shared/design_system/tokens/color_tokens.dart';
import '../../../../shared/design_system/tokens/spacing_tokens.dart';
import '../../../../shared/design_system/tokens/typography_tokens.dart';
-/// États de l'authentification WebView
-enum KeycloakWebViewAuthState {
- /// Initialisation en cours
- initializing,
- /// Chargement de la page d'authentification
- loading,
- /// Page d'authentification affichée
- ready,
- /// Authentification en cours
- authenticating,
- /// Authentification réussie
- success,
- /// Erreur d'authentification
- error,
- /// Timeout
- timeout,
-}
-
-/// Page d'authentification Keycloak avec WebView
+/// Page d'authentification Keycloak via AppAuth
class KeycloakWebViewAuthPage extends StatefulWidget {
- /// Callback appelé en cas de succès d'authentification
final Function(User user) onAuthSuccess;
-
- /// Callback appelé en cas d'erreur
final Function(String error) onAuthError;
-
- /// Callback appelé en cas d'annulation
final VoidCallback? onAuthCancel;
-
- /// Timeout pour l'authentification (en secondes)
final int timeoutSeconds;
-
+
const KeycloakWebViewAuthPage({
super.key,
required this.onAuthSuccess,
required this.onAuthError,
this.onAuthCancel,
- this.timeoutSeconds = 300, // 5 minutes par défaut
+ this.timeoutSeconds = 300,
});
@override
State createState() => _KeycloakWebViewAuthPageState();
}
-class _KeycloakWebViewAuthPageState extends State
- with TickerProviderStateMixin {
-
- // Contrôleurs et état
- late WebViewController _webViewController;
- late AnimationController _progressAnimationController;
- late Animation _progressAnimation;
- Timer? _timeoutTimer;
-
- // État de l'authentification
- KeycloakWebViewAuthState _authState = KeycloakWebViewAuthState.initializing;
+class _KeycloakWebViewAuthPageState extends State {
+ bool _loading = true;
String? _errorMessage;
- double _loadingProgress = 0.0;
-
-
- // Paramètres d'authentification
- String? _authUrl;
+ static const _appAuth = FlutterAppAuth();
+ static const _storage = FlutterSecureStorage(
+ aOptions: AndroidOptions(encryptedSharedPreferences: true),
+ iOptions: IOSOptions(accessibility: KeychainAccessibility.first_unlock_this_device),
+ );
@override
void initState() {
super.initState();
- _initializeAnimations();
- _initializeAuthentication();
+ _authenticate();
}
- @override
- void dispose() {
- _progressAnimationController.dispose();
- _timeoutTimer?.cancel();
- super.dispose();
- }
-
- /// Initialise les animations
- void _initializeAnimations() {
- _progressAnimationController = AnimationController(
- duration: const Duration(milliseconds: 300),
- vsync: this,
- );
-
- _progressAnimation = Tween(
- begin: 0.0,
- end: 1.0,
- ).animate(CurvedAnimation(
- parent: _progressAnimationController,
- curve: Curves.easeInOut,
- ));
- }
-
- /// Initialise l'authentification
- Future _initializeAuthentication() async {
+ Future _authenticate() async {
try {
- debugPrint('🚀 Initialisation de l\'authentification WebView...');
-
- setState(() {
- _authState = KeycloakWebViewAuthState.initializing;
- });
-
- // Préparer l'authentification
- final Map authParams =
- await KeycloakWebViewAuthService.prepareAuthentication();
-
- _authUrl = authParams['url'];
-
- if (_authUrl == null) {
- throw Exception('URL d\'authentification manquante');
- }
-
- // Initialiser la WebView
- await _initializeWebView();
-
- // Démarrer le timer de timeout
- _startTimeoutTimer();
-
- debugPrint('✅ Authentification initialisée avec succès');
-
- } catch (e) {
- debugPrint('💥 Erreur initialisation authentification: $e');
- _handleError('Erreur d\'initialisation: $e');
- }
- }
-
- /// Initialise la WebView
- Future _initializeWebView() async {
- _webViewController = WebViewController()
- ..setJavaScriptMode(JavaScriptMode.unrestricted)
- ..setBackgroundColor(ColorTokens.surface)
- ..setNavigationDelegate(
- NavigationDelegate(
- onProgress: _onLoadingProgress,
- onPageStarted: _onPageStarted,
- onPageFinished: _onPageFinished,
- onWebResourceError: _onWebResourceError,
- onNavigationRequest: _onNavigationRequest,
+ final result = await _appAuth.authorizeAndExchangeCode(
+ AuthorizationTokenRequest(
+ KeycloakConfig.clientId,
+ 'dev.lions.unionflow-mobile://auth/callback',
+ serviceConfiguration: AuthorizationServiceConfiguration(
+ authorizationEndpoint:
+ '${KeycloakConfig.baseUrl}/realms/${KeycloakConfig.realm}/protocol/openid-connect/auth',
+ tokenEndpoint: KeycloakConfig.tokenEndpoint,
+ ),
+ scopes: ['openid', 'profile', 'email', 'roles', 'offline_access'],
+ additionalParameters: {'kc_locale': 'fr'},
+ allowInsecureConnections: true,
),
);
-
- // Charger l'URL d'authentification
- if (_authUrl != null) {
- await _webViewController.loadRequest(Uri.parse(_authUrl!));
-
- setState(() {
- _authState = KeycloakWebViewAuthState.loading;
- });
- }
- }
- /// Démarre le timer de timeout
- void _startTimeoutTimer() {
- _timeoutTimer = Timer(Duration(seconds: widget.timeoutSeconds), () {
- if (_authState != KeycloakWebViewAuthState.success) {
- debugPrint('⏰ Timeout d\'authentification atteint');
- _handleTimeout();
- }
- });
- }
-
- /// Gère la progression du chargement
- void _onLoadingProgress(int progress) {
- setState(() {
- _loadingProgress = progress / 100.0;
- });
-
- if (progress == 100) {
- _progressAnimationController.forward();
- }
- }
-
- /// Gère le début du chargement d'une page
- void _onPageStarted(String url) {
- debugPrint('📄 Chargement de la page: $url');
-
- setState(() {
- _loadingProgress = 0.0;
- });
-
- _progressAnimationController.reset();
- }
-
- /// Gère la fin du chargement d'une page
- void _onPageFinished(String url) {
- debugPrint('✅ Page chargée: $url');
-
- setState(() {
- if (_authState == KeycloakWebViewAuthState.loading) {
- _authState = KeycloakWebViewAuthState.ready;
- }
- });
- }
-
- /// Gère les erreurs de ressources web
- void _onWebResourceError(WebResourceError error) {
- debugPrint('💥 Erreur WebView: ${error.description}');
-
- // Ignorer certaines erreurs non critiques
- if (error.errorCode == -999) { // Code d'erreur pour annulation
- return;
- }
-
- _handleError('Erreur de chargement: ${error.description}');
- }
-
- /// Gère les requêtes de navigation
- NavigationDecision _onNavigationRequest(NavigationRequest request) {
- final String url = request.url;
- debugPrint('🔗 Navigation vers: $url');
-
- // Vérifier si c'est notre URL de callback
- if (url.startsWith('dev.lions.unionflow-mobile://auth/callback')) {
- debugPrint('🎯 URL de callback détectée: $url');
- _handleAuthCallback(url);
- return NavigationDecision.prevent;
- }
-
- // Vérifier d'autres patterns de callback possibles
- if (url.contains('code=') && url.contains('state=')) {
- debugPrint('🎯 Callback potentiel détecté (avec code et state): $url');
- _handleAuthCallback(url);
- return NavigationDecision.prevent;
- }
-
- return NavigationDecision.navigate;
- }
-
- /// Traite le callback d'authentification
- Future _handleAuthCallback(String callbackUrl) async {
- try {
- setState(() {
- _authState = KeycloakWebViewAuthState.authenticating;
- });
-
- debugPrint('🔄 Traitement du callback d\'authentification...');
- debugPrint('📋 URL de callback reçue: $callbackUrl');
-
- // Traiter le callback via le service
- final User user = await KeycloakWebViewAuthService.handleAuthCallback(callbackUrl);
-
- setState(() {
- _authState = KeycloakWebViewAuthState.success;
- });
-
- // Annuler le timer de timeout
- _timeoutTimer?.cancel();
-
- debugPrint('🎉 Authentification réussie pour: ${user.fullName}');
- debugPrint('👤 Rôle: ${user.primaryRole.displayName}');
- debugPrint('🔐 Permissions: ${user.additionalPermissions.length}');
-
- // Notifier le succès avec un délai pour l'animation
- Future.delayed(const Duration(milliseconds: 500), () {
- widget.onAuthSuccess(user);
- });
-
- } catch (e, stackTrace) {
- debugPrint('💥 Erreur traitement callback: $e');
- debugPrint('📋 Stack trace: $stackTrace');
-
- // Essayer de donner plus d'informations sur l'erreur
- String errorMessage = 'Erreur d\'authentification: $e';
- if (e.toString().contains('MISSING_AUTH_STATE')) {
- errorMessage = 'Session expirée. Veuillez réessayer.';
- } else if (e.toString().contains('INVALID_STATE')) {
- errorMessage = 'Erreur de sécurité. Veuillez réessayer.';
- } else if (e.toString().contains('MISSING_AUTH_CODE')) {
- errorMessage = 'Code d\'autorisation manquant. Veuillez réessayer.';
+ if (result?.accessToken == null) {
+ _onError('Authentification annulée ou échouée.');
+ return;
}
- _handleError(errorMessage);
+ await _storage.write(key: 'kc_access', value: result!.accessToken);
+ if (result.refreshToken != null) {
+ await _storage.write(key: 'kc_refresh', value: result.refreshToken);
+ }
+ if (result.idToken != null) {
+ await _storage.write(key: 'kc_id', value: result.idToken);
+ }
+
+ final accessPayload = JwtDecoder.decode(result.accessToken!);
+ final idPayload = result.idToken != null ? JwtDecoder.decode(result.idToken!) : accessPayload;
+
+ final roles = _extractRoles(accessPayload);
+ final primaryRole = KeycloakRoleMapper.mapToUserRole(roles);
+
+ final user = User(
+ id: idPayload['sub'] ?? '',
+ email: idPayload['email'] ?? '',
+ firstName: idPayload['given_name'] ?? '',
+ lastName: idPayload['family_name'] ?? '',
+ primaryRole: primaryRole,
+ additionalPermissions: KeycloakRoleMapper.mapToPermissions(roles),
+ isActive: true,
+ lastLoginAt: DateTime.now(),
+ createdAt: DateTime.now(),
+ );
+
+ if (mounted) {
+ setState(() => _loading = false);
+ Future.delayed(const Duration(milliseconds: 300), () {
+ widget.onAuthSuccess(user);
+ });
+ }
+ } catch (e) {
+ _onError('Erreur d\'authentification: $e');
}
}
- /// Gère les erreurs
- void _handleError(String error) {
- setState(() {
- _authState = KeycloakWebViewAuthState.error;
- _errorMessage = error;
- });
-
- _timeoutTimer?.cancel();
-
- // Vibration pour indiquer l'erreur
+ void _onError(String error) {
HapticFeedback.lightImpact();
-
+ if (mounted) setState(() { _loading = false; _errorMessage = error; });
widget.onAuthError(error);
}
- /// Gère le timeout
- void _handleTimeout() {
- setState(() {
- _authState = KeycloakWebViewAuthState.timeout;
- _errorMessage = 'Timeout d\'authentification atteint';
- });
-
- HapticFeedback.lightImpact();
-
- widget.onAuthError('Timeout d\'authentification');
- }
-
- /// Gère l'annulation
void _handleCancel() {
- debugPrint('❌ Authentification annulée par l\'utilisateur');
-
- _timeoutTimer?.cancel();
-
if (widget.onAuthCancel != null) {
widget.onAuthCancel!();
} else {
@@ -329,92 +123,45 @@ class _KeycloakWebViewAuthPageState extends State
}
}
+ List _extractRoles(Map payload) {
+ final roles = [];
+ if (payload['realm_access']?['roles'] != null) {
+ roles.addAll((payload['realm_access']['roles'] as List).cast());
+ }
+ if (payload['resource_access'] != null) {
+ (payload['resource_access'] as Map).values.forEach((v) {
+ if (v['roles'] != null) roles.addAll((v['roles'] as List).cast());
+ });
+ }
+ return roles.where((r) => !r.startsWith('default-roles-') && r != 'offline_access').toList();
+ }
+
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: ColorTokens.surface,
- appBar: _buildAppBar(),
- body: _buildBody(),
- );
- }
-
- /// Construit l'AppBar
- PreferredSizeWidget _buildAppBar() {
- return AppBar(
- backgroundColor: ColorTokens.primary,
- foregroundColor: ColorTokens.onPrimary,
- elevation: 0,
- title: Text(
- 'Connexion Sécurisée',
- style: TypographyTokens.headlineSmall.copyWith(
- color: ColorTokens.onPrimary,
- fontWeight: FontWeight.w600,
- ),
- ),
- leading: IconButton(
- icon: const Icon(Icons.close),
- onPressed: _handleCancel,
- tooltip: 'Annuler',
- ),
- actions: [
- if (_authState == KeycloakWebViewAuthState.ready)
- IconButton(
- icon: const Icon(Icons.refresh),
- onPressed: () => _webViewController.reload(),
- tooltip: 'Actualiser',
+ appBar: AppBar(
+ backgroundColor: ColorTokens.primary,
+ foregroundColor: ColorTokens.onPrimary,
+ elevation: 0,
+ title: Text(
+ 'Connexion Sécurisée',
+ style: TypographyTokens.headlineSmall.copyWith(
+ color: ColorTokens.onPrimary,
+ fontWeight: FontWeight.w600,
),
- ],
- bottom: _buildProgressIndicator(),
+ ),
+ leading: IconButton(
+ icon: const Icon(Icons.close),
+ onPressed: _handleCancel,
+ tooltip: 'Annuler',
+ ),
+ ),
+ body: _errorMessage != null ? _buildErrorView() : _buildLoadingView(),
);
}
- /// Construit l'indicateur de progression
- PreferredSizeWidget? _buildProgressIndicator() {
- if (_authState == KeycloakWebViewAuthState.loading ||
- _authState == KeycloakWebViewAuthState.authenticating) {
- return PreferredSize(
- preferredSize: const Size.fromHeight(4.0),
- child: AnimatedBuilder(
- animation: _progressAnimation,
- builder: (context, child) {
- return LinearProgressIndicator(
- value: _authState == KeycloakWebViewAuthState.authenticating
- ? null
- : _loadingProgress,
- backgroundColor: ColorTokens.onPrimary.withOpacity(0.3),
- valueColor: const AlwaysStoppedAnimation(ColorTokens.onPrimary),
- );
- },
- ),
- );
- }
- return null;
- }
-
- /// Construit le corps de la page
- Widget _buildBody() {
- switch (_authState) {
- case KeycloakWebViewAuthState.initializing:
- return _buildInitializingView();
-
- case KeycloakWebViewAuthState.loading:
- case KeycloakWebViewAuthState.ready:
- return _buildWebView();
-
- case KeycloakWebViewAuthState.authenticating:
- return _buildAuthenticatingView();
-
- case KeycloakWebViewAuthState.success:
- return _buildSuccessView();
-
- case KeycloakWebViewAuthState.error:
- case KeycloakWebViewAuthState.timeout:
- return _buildErrorView();
- }
- }
-
- /// Vue d'initialisation
- Widget _buildInitializingView() {
+ Widget _buildLoadingView() {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@@ -422,95 +169,14 @@ class _KeycloakWebViewAuthPageState extends State
const CircularProgressIndicator(),
const SizedBox(height: SpacingTokens.xl),
Text(
- 'Initialisation...',
- style: TypographyTokens.bodyLarge.copyWith(
- color: ColorTokens.onSurface,
- ),
+ 'Connexion en cours...',
+ style: TypographyTokens.bodyLarge.copyWith(color: ColorTokens.onSurface),
),
],
),
);
}
- /// Vue WebView
- Widget _buildWebView() {
- return WebViewWidget(controller: _webViewController);
- }
-
- /// Vue d'authentification en cours
- Widget _buildAuthenticatingView() {
- return Container(
- color: ColorTokens.surface,
- child: Center(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- const CircularProgressIndicator(),
- const SizedBox(height: SpacingTokens.xxxl),
- Text(
- 'Connexion en cours...',
- style: TypographyTokens.headlineSmall.copyWith(
- color: ColorTokens.onSurface,
- fontWeight: FontWeight.w600,
- ),
- ),
- const SizedBox(height: SpacingTokens.xl),
- Text(
- 'Veuillez patienter pendant que nous\nvérifions vos informations.',
- textAlign: TextAlign.center,
- style: TypographyTokens.bodyMedium.copyWith(
- color: ColorTokens.onSurface.withOpacity(0.7),
- ),
- ),
- ],
- ),
- ),
- );
- }
-
- /// Vue de succès
- Widget _buildSuccessView() {
- return Container(
- color: ColorTokens.surface,
- child: Center(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Container(
- width: 80,
- height: 80,
- decoration: const BoxDecoration(
- color: Colors.green,
- shape: BoxShape.circle,
- ),
- child: const Icon(
- Icons.check,
- color: Colors.white,
- size: 48,
- ),
- ),
- const SizedBox(height: SpacingTokens.xxxl),
- Text(
- 'Connexion réussie !',
- style: TypographyTokens.headlineSmall.copyWith(
- color: ColorTokens.onSurface,
- fontWeight: FontWeight.w600,
- ),
- ),
- const SizedBox(height: SpacingTokens.xl),
- Text(
- 'Redirection vers l\'application...',
- style: TypographyTokens.bodyMedium.copyWith(
- color: ColorTokens.onSurface.withOpacity(0.7),
- ),
- ),
- ],
- ),
- ),
- );
- }
-
- /// Vue d'erreur
Widget _buildErrorView() {
return Container(
color: ColorTokens.surface,
@@ -526,19 +192,11 @@ class _KeycloakWebViewAuthPageState extends State
color: ColorTokens.error,
shape: BoxShape.circle,
),
- child: Icon(
- _authState == KeycloakWebViewAuthState.timeout
- ? Icons.access_time
- : Icons.error_outline,
- color: ColorTokens.onError,
- size: 48,
- ),
+ child: const Icon(Icons.error_outline, color: ColorTokens.onError, size: 48),
),
const SizedBox(height: SpacingTokens.xxxl),
Text(
- _authState == KeycloakWebViewAuthState.timeout
- ? 'Délai d\'attente dépassé'
- : 'Erreur de connexion',
+ 'Erreur de connexion',
style: TypographyTokens.headlineSmall.copyWith(
color: ColorTokens.onSurface,
fontWeight: FontWeight.w600,
@@ -557,7 +215,10 @@ class _KeycloakWebViewAuthPageState extends State
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
ElevatedButton.icon(
- onPressed: _initializeAuthentication,
+ onPressed: () {
+ setState(() { _loading = true; _errorMessage = null; });
+ _authenticate();
+ },
icon: const Icon(Icons.refresh),
label: const Text('Réessayer'),
style: ElevatedButton.styleFrom(
diff --git a/lib/features/authentication/presentation/pages/login_page.dart b/lib/features/authentication/presentation/pages/login_page.dart
index 4067d1f..d2ce21d 100644
--- a/lib/features/authentication/presentation/pages/login_page.dart
+++ b/lib/features/authentication/presentation/pages/login_page.dart
@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:local_auth/local_auth.dart';
-import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher.dart';
import '../bloc/auth_bloc.dart';
@@ -20,16 +19,11 @@ class LoginPage extends StatefulWidget {
}
class _LoginPageState extends State with TickerProviderStateMixin {
- final _emailController = TextEditingController();
- final _passwordController = TextEditingController();
-
late final AnimationController _fadeController;
late final AnimationController _slideController;
late final Animation _fadeAnim;
late final Animation _slideAnim;
- bool _obscurePassword = true;
- bool _rememberMe = false;
bool _biometricAvailable = false;
final _localAuth = LocalAuthentication();
@@ -50,15 +44,12 @@ class _LoginPageState extends State with TickerProviderStateMixin {
_fadeController.forward();
_slideController.forward();
_checkBiometrics();
- _loadSavedCredentials();
}
@override
void dispose() {
_fadeController.dispose();
_slideController.dispose();
- _emailController.dispose();
- _passwordController.dispose();
super.dispose();
}
@@ -70,17 +61,6 @@ class _LoginPageState extends State with TickerProviderStateMixin {
} catch (_) {}
}
- Future _loadSavedCredentials() async {
- final prefs = await SharedPreferences.getInstance();
- final remember = prefs.getBool('uf_remember_me') ?? false;
- if (remember && mounted) {
- setState(() {
- _rememberMe = true;
- _emailController.text = prefs.getString('uf_saved_email') ?? '';
- });
- }
- }
-
Future _authenticateBiometric() async {
try {
final ok = await _localAuth.authenticate(
@@ -88,12 +68,7 @@ class _LoginPageState extends State with TickerProviderStateMixin {
options: const AuthenticationOptions(stickyAuth: true, biometricOnly: false),
);
if (ok && mounted) {
- final prefs = await SharedPreferences.getInstance();
- final email = prefs.getString('uf_saved_email') ?? '';
- final pass = prefs.getString('uf_saved_pass') ?? '';
- if (email.isNotEmpty && pass.isNotEmpty) {
- context.read().add(AuthLoginRequested(email, pass));
- }
+ context.read().add(const AuthStatusChecked());
}
} catch (_) {}
}
@@ -110,24 +85,8 @@ class _LoginPageState extends State with TickerProviderStateMixin {
} catch (_) {}
}
- Future _onLogin() async {
- final email = _emailController.text.trim();
- final password = _passwordController.text;
- if (email.isEmpty || password.isEmpty) return;
-
- if (_rememberMe) {
- final prefs = await SharedPreferences.getInstance();
- await prefs.setBool('uf_remember_me', true);
- await prefs.setString('uf_saved_email', email);
- await prefs.setString('uf_saved_pass', password);
- } else {
- final prefs = await SharedPreferences.getInstance();
- await prefs.remove('uf_remember_me');
- await prefs.remove('uf_saved_email');
- await prefs.remove('uf_saved_pass');
- }
-
- if (mounted) context.read().add(AuthLoginRequested(email, password));
+ void _onLogin() {
+ context.read().add(const AuthLoginRequested());
}
@override
@@ -267,51 +226,27 @@ class _LoginPageState extends State with TickerProviderStateMixin {
),
const SizedBox(height: 12),
- _GlassTextField(
- controller: _emailController,
- hint: 'Email ou identifiant',
- icon: Icons.person_outline_rounded,
- keyboardType: TextInputType.emailAddress,
- ),
- const SizedBox(height: 8),
-
- _GlassTextField(
- controller: _passwordController,
- hint: 'Mot de passe',
- icon: Icons.lock_outline_rounded,
- isPassword: true,
- obscure: _obscurePassword,
- onToggleObscure: () => setState(() => _obscurePassword = !_obscurePassword),
- ),
- const SizedBox(height: 8),
-
- // Remember me + Forgot password
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- _RememberMeToggle(
- value: _rememberMe,
- onChanged: (v) => setState(() => _rememberMe = v),
+ // Forgot password
+ Align(
+ alignment: Alignment.centerRight,
+ child: TextButton(
+ onPressed: _openForgotPassword,
+ style: TextButton.styleFrom(
+ padding: EdgeInsets.zero,
+ minimumSize: Size.zero,
+ tapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
- TextButton(
- onPressed: _openForgotPassword,
- style: TextButton.styleFrom(
- padding: EdgeInsets.zero,
- minimumSize: Size.zero,
- tapTargetSize: MaterialTapTargetSize.shrinkWrap,
- ),
- child: Text(
- 'Mot de passe oublié ?',
- style: GoogleFonts.roboto(
- fontSize: 12,
- color: Colors.white,
- fontWeight: FontWeight.w600,
- decoration: TextDecoration.underline,
- decorationColor: Colors.white.withOpacity(0.7),
- ),
+ child: Text(
+ 'Mot de passe oublié ?',
+ style: GoogleFonts.roboto(
+ fontSize: 12,
+ color: Colors.white,
+ fontWeight: FontWeight.w600,
+ decoration: TextDecoration.underline,
+ decorationColor: Colors.white.withOpacity(0.7),
),
),
- ],
+ ),
),
const SizedBox(height: 16),
@@ -361,108 +296,6 @@ class _LoginPageState extends State with TickerProviderStateMixin {
}
}
-// ─────────────────────────────────────────────────────────────────────────────
-// Sous-composants privés
-// ─────────────────────────────────────────────────────────────────────────────
-
-class _GlassTextField extends StatelessWidget {
- const _GlassTextField({
- required this.controller,
- required this.hint,
- required this.icon,
- this.keyboardType,
- this.isPassword = false,
- this.obscure = false,
- this.onToggleObscure,
- });
-
- final TextEditingController controller;
- final String hint;
- final IconData icon;
- final TextInputType? keyboardType;
- final bool isPassword;
- final bool obscure;
- final VoidCallback? onToggleObscure;
-
- @override
- Widget build(BuildContext context) {
- return Container(
- decoration: BoxDecoration(
- color: Colors.white.withOpacity(0.13),
- borderRadius: BorderRadius.circular(8),
- border: Border.all(color: Colors.white.withOpacity(0.28), width: 1),
- ),
- child: TextField(
- controller: controller,
- obscureText: isPassword && obscure,
- keyboardType: keyboardType,
- style: GoogleFonts.roboto(fontSize: 15, color: Colors.white),
- decoration: InputDecoration(
- hintText: hint,
- hintStyle: GoogleFonts.roboto(fontSize: 14.5, color: Colors.white.withOpacity(0.48)),
- prefixIcon: Icon(icon, color: Colors.white54, size: 20),
- suffixIcon: isPassword
- ? IconButton(
- icon: Icon(
- obscure ? Icons.visibility_outlined : Icons.visibility_off_outlined,
- color: Colors.white54,
- size: 20,
- ),
- onPressed: onToggleObscure,
- )
- : null,
- border: InputBorder.none,
- contentPadding: const EdgeInsets.symmetric(vertical: 10, horizontal: 4),
- ),
- ),
- );
- }
-}
-
-class _RememberMeToggle extends StatelessWidget {
- const _RememberMeToggle({required this.value, required this.onChanged});
-
- final bool value;
- final ValueChanged onChanged;
-
- @override
- Widget build(BuildContext context) {
- return GestureDetector(
- onTap: () => onChanged(!value),
- behavior: HitTestBehavior.opaque,
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- SizedBox(
- width: 18,
- height: 18,
- child: Checkbox(
- value: value,
- onChanged: (v) => onChanged(v ?? false),
- fillColor: WidgetStateProperty.resolveWith((s) {
- if (s.contains(WidgetState.selected)) return Colors.white;
- return Colors.transparent;
- }),
- checkColor: const Color(0xFF2E7D32),
- side: const BorderSide(color: Colors.white60, width: 1.5),
- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(4)),
- materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
- ),
- ),
- const SizedBox(width: 7),
- Text(
- 'Se souvenir de moi',
- style: GoogleFonts.roboto(
- fontSize: 12,
- color: Colors.white.withOpacity(0.78),
- ),
- ),
- ],
- ),
- );
- }
-}
-
// ─────────────────────────────────────────────────────────────────────────────
// Painters
// ─────────────────────────────────────────────────────────────────────────────
diff --git a/lib/features/dashboard/presentation/bloc/dashboard_bloc.dart b/lib/features/dashboard/presentation/bloc/dashboard_bloc.dart
index 05d49d8..df89485 100644
--- a/lib/features/dashboard/presentation/bloc/dashboard_bloc.dart
+++ b/lib/features/dashboard/presentation/bloc/dashboard_bloc.dart
@@ -50,20 +50,23 @@ class DashboardBloc extends Bloc {
// Écouter les events WebSocket
_webSocketEventSubscription = webSocketService.eventStream.listen(
(event) {
- AppLogger.info('DashboardBloc: Event WebSocket reçu - ${event.eventType}');
+ try {
+ AppLogger.info('DashboardBloc: Event WebSocket reçu - ${event.eventType}');
- // Dispatcher uniquement les events pertinents au dashboard
- if (event is DashboardStatsEvent) {
- add(RefreshDashboardFromWebSocket(event.data));
- } else if (event is FinanceApprovalEvent) {
- // Les approbations affectent les stats, rafraîchir
- add(RefreshDashboardFromWebSocket(event.data));
- } else if (event is MemberEvent) {
- // Les changements de membres affectent les stats
- add(RefreshDashboardFromWebSocket(event.data));
- } else if (event is ContributionEvent) {
- // Les cotisations affectent les stats financières
- add(RefreshDashboardFromWebSocket(event.data));
+ if (isClosed) return;
+
+ // Dispatcher uniquement les events pertinents au dashboard
+ if (event is DashboardStatsEvent) {
+ add(RefreshDashboardFromWebSocket(event.data));
+ } else if (event is FinanceApprovalEvent) {
+ add(RefreshDashboardFromWebSocket(event.data));
+ } else if (event is MemberEvent) {
+ add(RefreshDashboardFromWebSocket(event.data));
+ } else if (event is ContributionEvent) {
+ add(RefreshDashboardFromWebSocket(event.data));
+ }
+ } catch (e, s) {
+ AppLogger.error('DashboardBloc: erreur lors du traitement WebSocket event', error: e);
}
},
onError: (error) {
diff --git a/lib/features/dashboard/presentation/pages/connected_dashboard_page.dart b/lib/features/dashboard/presentation/pages/connected_dashboard_page.dart
deleted file mode 100644
index 526250c..0000000
--- a/lib/features/dashboard/presentation/pages/connected_dashboard_page.dart
+++ /dev/null
@@ -1,760 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:fl_chart/fl_chart.dart';
-import '../../../../shared/design_system/unionflow_design_v2.dart';
-import '../../../../shared/design_system/unionflow_design_system.dart';
-import '../../../contributions/presentation/pages/contributions_page_wrapper.dart';
-import '../../../epargne/presentation/pages/epargne_page.dart';
-import '../../../events/presentation/pages/events_page_wrapper.dart';
-import '../bloc/dashboard_bloc.dart';
-import '../../domain/entities/dashboard_entity.dart';
-
-/// Page dashboard connectée au backend - Design UnionFlow Animé
-class ConnectedDashboardPage extends StatefulWidget {
- final String organizationId;
- final String userId;
-
- const ConnectedDashboardPage({
- super.key,
- required this.organizationId,
- required this.userId,
- });
-
- @override
- State createState() => _ConnectedDashboardPageState();
-}
-
-class _ConnectedDashboardPageState extends State with SingleTickerProviderStateMixin {
- late TabController _tabController;
- PeriodFilter _selectedPeriod = PeriodFilter.month;
- int _unreadNotifications = 5;
- bool _isExporting = false;
-
- @override
- void initState() {
- super.initState();
- _tabController = TabController(length: 3, vsync: this);
- context.read().add(LoadDashboardData(
- organizationId: widget.organizationId,
- userId: widget.userId,
- ));
- }
-
- @override
- void dispose() {
- _tabController.dispose();
- super.dispose();
- }
-
- @override
- Widget build(BuildContext context) {
- return Scaffold(
- backgroundColor: AppColors.lightBackground,
- appBar: _buildAppBar(),
- body: AfricanPatternBackground(
- child: BlocBuilder(
- builder: (context, state) {
- if (state is DashboardLoading) {
- return const Center(
- child: CircularProgressIndicator(color: AppColors.primaryGreen),
- );
- }
-
- if (state is DashboardMemberNotRegistered) {
- return _buildMemberNotRegisteredState();
- }
-
- if (state is DashboardError) {
- return _buildErrorState(state.message);
- }
-
- if (state is DashboardLoaded) {
- return _buildDashboardContent(state);
- }
-
- return const SizedBox.shrink();
- },
- ),
- ),
- );
- }
-
- PreferredSizeWidget _buildAppBar() {
- return AppBar(
- backgroundColor: AppColors.lightSurface,
- elevation: 0,
- title: Row(
- children: [
- Hero(
- tag: 'unionflow_logo',
- child: Container(
- width: 32,
- height: 32,
- decoration: BoxDecoration(
- gradient: UnionFlowColors.primaryGradient,
- borderRadius: BorderRadius.circular(8),
- ),
- alignment: Alignment.center,
- child: const Text(
- 'U',
- style: TextStyle(
- color: Colors.white,
- fontWeight: FontWeight.w900,
- fontSize: 18,
- ),
- ),
- ),
- ),
- const SizedBox(width: 12),
- const Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- 'UnionFlow',
- style: TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w700,
- color: AppColors.textPrimaryLight,
- ),
- ),
- Text(
- 'Dashboard',
- style: TextStyle(
- fontSize: 11,
- fontWeight: FontWeight.w400,
- color: AppColors.textSecondaryLight,
- ),
- ),
- ],
- ),
- ],
- ),
- automaticallyImplyLeading: false,
- actions: [
- UnionExportButton(
- isLoading: _isExporting,
- onExport: (exportType) {
- showDialog(
- context: context,
- builder: (context) => ExportConfirmDialog(
- exportType: exportType,
- onConfirm: () => _handleExport(exportType),
- ),
- );
- },
- ),
- const SizedBox(width: 8),
- UnionNotificationBadge(
- count: _unreadNotifications,
- child: IconButton(
- icon: const Icon(Icons.notifications_outlined),
- color: AppColors.textPrimaryLight,
- onPressed: () {
- setState(() => _unreadNotifications = 0);
- UnionNotificationToast.show(
- context,
- title: 'Notifications',
- message: 'Aucune nouvelle notification',
- icon: Icons.notifications_active,
- color: UnionFlowColors.info,
- );
- },
- ),
- ),
- const SizedBox(width: 8),
- ],
- bottom: TabBar(
- controller: _tabController,
- labelColor: AppColors.primaryGreen,
- unselectedLabelColor: AppColors.textSecondaryLight,
- indicatorColor: AppColors.primaryGreen,
- labelStyle: const TextStyle(fontSize: 13, fontWeight: FontWeight.w700),
- tabs: const [
- Tab(text: 'Vue d\'ensemble'),
- Tab(text: 'Analytique'),
- Tab(text: 'Activités'),
- ],
- ),
- );
- }
-
- Widget _buildDashboardContent(DashboardLoaded state) {
- final data = state.dashboardData;
-
- return RefreshIndicator(
- onRefresh: () async {
- context.read().add(LoadDashboardData(
- organizationId: widget.organizationId,
- userId: widget.userId,
- ));
- },
- color: AppColors.primaryGreen,
- child: TabBarView(
- controller: _tabController,
- children: [
- _buildOverviewTab(data),
- _buildAnalyticsTab(data),
- _buildActivitiesTab(data),
- ],
- ),
- );
- }
-
- UnionTransactionTile _activityToTile(RecentActivityEntity a) {
- final amount = a.metadata != null && a.metadata!['amount'] != null
- ? '${a.metadata!['amount']} FCFA'
- : (a.title.isNotEmpty ? a.title : '-');
- return UnionTransactionTile(
- name: a.userName,
- amount: amount,
- status: a.type.isNotEmpty ? a.type : 'Confirmé',
- date: a.timeAgo,
- );
- }
-
- Widget _buildOverviewTab(DashboardEntity data) {
- final stats = data.stats;
- return SingleChildScrollView(
- physics: const AlwaysScrollableScrollPhysics(),
- padding: const EdgeInsets.all(12),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- // Balance principale - Animée
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 100),
- child: UnionBalanceCard(
- label: 'Caisse Totale',
- amount: _formatAmount(stats.totalContributionAmount),
- trend: stats.monthlyGrowth > 0 ? '+${(stats.monthlyGrowth * 100).toStringAsFixed(0)}% ce mois' : 'Stable',
- isTrendPositive: true,
- ),
- ),
- const SizedBox(height: 24),
-
- // Stats en grille - Animées avec délai
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 200),
- child: Row(
- children: [
- Expanded(
- child: UnionStatWidget(
- label: 'Membres',
- value: stats.totalMembers.toString(),
- icon: Icons.people_outline,
- color: AppColors.primaryGreen,
- trend: '+8%',
- isTrendUp: true,
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: UnionStatWidget(
- label: 'Actifs',
- value: stats.activeMembers.toString(),
- icon: Icons.check_circle_outline,
- color: UnionFlowColors.success,
- trend: '+5%',
- isTrendUp: true,
- ),
- ),
- ],
- ),
- ),
- const SizedBox(height: 12),
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 300),
- child: Row(
- children: [
- Expanded(
- child: UnionStatWidget(
- label: 'Événements',
- value: stats.totalEvents.toString(),
- icon: Icons.event_outlined,
- color: UnionFlowColors.gold,
- trend: '+3',
- isTrendUp: true,
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: UnionStatWidget(
- label: 'À venir',
- value: stats.upcomingEvents.toString(),
- icon: Icons.calendar_today,
- color: UnionFlowColors.amber,
- ),
- ),
- ],
- ),
- ),
- const SizedBox(height: 12),
-
- // Progression - Animée
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 400),
- child: UnionProgressCard(
- title: 'Progression des Cotisations',
- progress: 0.7,
- subtitle: '70% des membres ont cotisé ce mois',
- ),
- ),
- const SizedBox(height: 12),
-
- // Actions rapides - Animées
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 500),
- begin: const Offset(0, 0.2),
- child: UnionActionGrid(
- actions: [
- UnionActionButton(
- icon: Icons.payment,
- label: 'Cotiser',
- onTap: () {
- Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => const ContributionsPageWrapper()),
- );
- },
- backgroundColor: UnionFlowColors.unionGreenPale,
- iconColor: AppColors.primaryGreen,
- ),
- UnionActionButton(
- icon: Icons.send,
- label: 'Envoyer',
- onTap: () {
- Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => const ContributionsPageWrapper()),
- );
- },
- backgroundColor: UnionFlowColors.goldPale,
- iconColor: UnionFlowColors.gold,
- ),
- UnionActionButton(
- icon: Icons.download,
- label: 'Retirer',
- onTap: () {
- Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => const EpargnePage()),
- );
- },
- backgroundColor: UnionFlowColors.terracottaPale,
- iconColor: UnionFlowColors.terracotta,
- ),
- UnionActionButton(
- icon: Icons.add_circle_outline,
- label: 'Créer',
- onTap: () {
- Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => const EventsPageWrapper()),
- );
- },
- backgroundColor: UnionFlowColors.infoPale,
- iconColor: UnionFlowColors.info,
- ),
- ],
- ),
- ),
- const SizedBox(height: 12),
-
- // Activité récente - Animée
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 600),
- child: UnionTransactionCard(
- title: 'Activité Récente',
- onSeeAll: () {
- Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => const ContributionsPageWrapper()),
- );
- },
- transactions: data.recentActivities.take(6).map((a) => _activityToTile(a)).toList(),
- ),
- ),
- ],
- ),
- );
- }
-
- Widget _buildAnalyticsTab(DashboardEntity data) {
- final stats = data.stats;
- final entrees = stats.totalContributionAmount;
- final sorties = stats.pendingRequests * 1000.0;
- final benefice = entrees - sorties;
- final taux = (stats.engagementRate * 100).toStringAsFixed(0);
- return SingleChildScrollView(
- physics: const AlwaysScrollableScrollPhysics(),
- padding: const EdgeInsets.all(12),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- // Filtre de période - Animé
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 50),
- child: UnionPeriodFilter(
- selectedPeriod: _selectedPeriod,
- onPeriodChanged: (period) {
- setState(() => _selectedPeriod = period);
- UnionNotificationToast.show(
- context,
- title: 'Période mise à jour',
- message: 'Affichage pour ${period.label.toLowerCase()}',
- icon: Icons.calendar_today,
- color: AppColors.primaryGreen,
- );
- },
- ),
- ),
- const SizedBox(height: 24),
-
- // Line Chart - Animé (évolution basée sur total cotisations + croissance)
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 100),
- child: UnionLineChart(
- title: 'Évolution de la Caisse',
- subtitle: 'Derniers 12 mois',
- spots: _buildEvolutionSpots(stats.totalContributionAmount, stats.monthlyGrowth),
- ),
- ),
- const SizedBox(height: 24),
-
- // Pie Chart - Animé
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 300),
- child: UnionPieChart(
- title: 'Répartition des Cotisations',
- subtitle: 'Par catégorie',
- sections: [
- UnionPieChartSection.create(
- value: 40,
- color: AppColors.primaryGreen,
- title: '40%\nCotisations',
- ),
- UnionPieChartSection.create(
- value: 30,
- color: UnionFlowColors.gold,
- title: '30%\nÉpargne',
- ),
- UnionPieChartSection.create(
- value: 20,
- color: UnionFlowColors.terracotta,
- title: '20%\nSolidarité',
- ),
- UnionPieChartSection.create(
- value: 10,
- color: UnionFlowColors.amber,
- title: '10%\nAutres',
- ),
- ],
- ),
- ),
- const SizedBox(height: 12),
-
- // Titre
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 400),
- child: const Text(
- 'Métriques Financières',
- style: TextStyle(
- fontSize: 13,
- fontWeight: FontWeight.w700,
- color: AppColors.textPrimaryLight,
- ),
- ),
- ),
- const SizedBox(height: 8),
-
- // Métriques - Animées (données backend)
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 500),
- begin: const Offset(0, 0.2),
- child: Column(
- children: [
- Row(
- children: [
- Expanded(
- child: _buildFinanceMetric(
- 'Entrées',
- _formatFcfa(entrees),
- Icons.arrow_downward,
- UnionFlowColors.success,
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: _buildFinanceMetric(
- 'Sorties',
- _formatFcfa(sorties),
- Icons.arrow_upward,
- UnionFlowColors.error,
- ),
- ),
- ],
- ),
- const SizedBox(height: 12),
- Row(
- children: [
- Expanded(
- child: _buildFinanceMetric(
- 'Bénéfice',
- _formatFcfa(benefice),
- Icons.trending_up,
- UnionFlowColors.gold,
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: _buildFinanceMetric(
- 'Taux',
- '$taux%',
- Icons.percent,
- UnionFlowColors.info,
- ),
- ),
- ],
- ),
- ],
- ),
- ),
- ],
- ),
- );
- }
-
- Widget _buildActivitiesTab(DashboardEntity data) {
- final tiles = data.recentActivities.map((a) => _activityToTile(a)).toList();
- return SingleChildScrollView(
- physics: const AlwaysScrollableScrollPhysics(),
- padding: const EdgeInsets.all(12),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 100),
- child: UnionTransactionCard(
- title: 'Toutes les Activités',
- onSeeAll: () {
- Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => const ContributionsPageWrapper()),
- );
- },
- transactions: tiles,
- ),
- ),
- ],
- ),
- );
- }
-
- Future _handleExport(ExportType exportType) async {
- setState(() => _isExporting = true);
-
- // Simulation de l'export (dans un vrai cas, appel API ici)
- await Future.delayed(const Duration(seconds: 2));
-
- setState(() => _isExporting = false);
-
- if (mounted) {
- UnionNotificationToast.show(
- context,
- title: 'Export réussi',
- message: 'Le rapport ${exportType.label} a été généré avec succès',
- icon: Icons.check_circle,
- color: UnionFlowColors.success,
- );
- }
- }
-
- String _formatFcfa(double value) {
- if (value >= 1000000) return '${(value / 1000000).toStringAsFixed(1)}M FCFA';
- if (value >= 1000) return '${(value / 1000).toStringAsFixed(0)}K FCFA';
- return '${value.toStringAsFixed(0)} FCFA';
- }
-
- List _buildEvolutionSpots(double totalAmount, double monthlyGrowth) {
- final spots = [];
- var v = totalAmount * 0.5;
- for (var i = 0; i < 12; i++) {
- spots.add(FlSpot(i.toDouble(), v));
- v = v * (1 + (monthlyGrowth > 0 ? monthlyGrowth : 0.02));
- }
- if (spots.isNotEmpty) spots[spots.length - 1] = FlSpot(11, totalAmount);
- return spots;
- }
-
- Widget _buildFinanceMetric(String label, String value, IconData icon, Color color) {
- return Container(
- padding: const EdgeInsets.all(10),
- decoration: BoxDecoration(
- color: AppColors.lightSurface,
- borderRadius: BorderRadius.circular(10),
- ),
- child: Row(
- children: [
- Container(
- padding: const EdgeInsets.all(7),
- decoration: BoxDecoration(
- color: color.withOpacity(0.1),
- borderRadius: BorderRadius.circular(8),
- ),
- child: Icon(icon, size: 16, color: color),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- label,
- style: const TextStyle(
- fontSize: 11,
- fontWeight: FontWeight.w600,
- color: AppColors.textSecondaryLight,
- ),
- ),
- const SizedBox(height: 4),
- Text(
- value,
- style: TextStyle(
- fontSize: 13,
- fontWeight: FontWeight.w700,
- color: color,
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- );
- }
-
- Widget _buildMemberNotRegisteredState() {
- return Center(
- child: Padding(
- padding: const EdgeInsets.all(24),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Container(
- padding: const EdgeInsets.all(16),
- decoration: BoxDecoration(
- gradient: UnionFlowColors.primaryGradient,
- shape: BoxShape.circle,
- ),
- child: const Icon(
- Icons.person_add_alt_1_outlined,
- size: 36,
- color: Colors.white,
- ),
- ),
- const SizedBox(height: 14),
- const Text(
- 'Bienvenue dans UnionFlow',
- style: TextStyle(
- fontSize: 15,
- fontWeight: FontWeight.w800,
- color: AppColors.textPrimaryLight,
- ),
- textAlign: TextAlign.center,
- ),
- const SizedBox(height: 8),
- const Text(
- 'Votre compte est en cours de configuration par un administrateur. '
- 'Votre tableau de bord sera disponible dès que votre profil membre aura été activé.',
- style: TextStyle(
- fontSize: 12,
- color: AppColors.textSecondaryLight,
- height: 1.5,
- ),
- textAlign: TextAlign.center,
- ),
- const SizedBox(height: 16),
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
- decoration: BoxDecoration(
- color: AppColors.primaryGreen.withOpacity(0.08),
- borderRadius: BorderRadius.circular(8),
- border: Border.all(color: AppColors.primaryGreen.withOpacity(0.3)),
- ),
- child: const Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Icon(Icons.info_outline, size: 18, color: AppColors.primaryGreen),
- SizedBox(width: 10),
- Flexible(
- child: Text(
- 'Contactez votre administrateur si ce message persiste.',
- style: TextStyle(
- fontSize: 13,
- color: AppColors.primaryGreen,
- fontWeight: FontWeight.w500,
- ),
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- ),
- );
- }
-
- Widget _buildErrorState(String message) {
- return Center(
- child: AnimatedFadeIn(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Container(
- padding: const EdgeInsets.all(16),
- decoration: BoxDecoration(
- color: UnionFlowColors.errorPale,
- shape: BoxShape.circle,
- ),
- child: const Icon(
- Icons.error_outline,
- size: 40,
- color: UnionFlowColors.error,
- ),
- ),
- const SizedBox(height: 12),
- const Text(
- 'Erreur de chargement',
- style: TextStyle(
- fontSize: 13,
- fontWeight: FontWeight.w700,
- color: AppColors.textPrimaryLight,
- ),
- ),
- const SizedBox(height: 8),
- Text(
- message,
- style: const TextStyle(
- fontSize: 13,
- color: AppColors.textSecondaryLight,
- ),
- textAlign: TextAlign.center,
- ),
- const SizedBox(height: 24),
- UFPrimaryButton(
- onPressed: () {
- context.read().add(LoadDashboardData(
- organizationId: widget.organizationId,
- userId: widget.userId,
- ));
- },
- label: 'RÉESSAYER',
- ),
- ],
- ),
- ),
- );
- }
-
- String _formatAmount(num amount) {
- return '${amount.toStringAsFixed(0).replaceAllMapped(
- RegExp(r'(\d{1,3})(?=(\d{3})+(?!\d))'),
- (Match m) => '${m[1]},',
- )} FCFA';
- }
-}
diff --git a/lib/features/dashboard/presentation/pages/role_dashboards/visitor_dashboard.dart b/lib/features/dashboard/presentation/pages/role_dashboards/visitor_dashboard.dart
index b3b74e2..4d9b106 100644
--- a/lib/features/dashboard/presentation/pages/role_dashboards/visitor_dashboard.dart
+++ b/lib/features/dashboard/presentation/pages/role_dashboards/visitor_dashboard.dart
@@ -2,270 +2,210 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import '../../../../../shared/design_system/unionflow_design_v2.dart';
import '../../../../authentication/presentation/bloc/auth_bloc.dart';
-import '../../widgets/dashboard_drawer.dart';
-/// Dashboard Visiteur - Design UnionFlow Version Publique
+/// Dashboard affiché pour un compte authentifié sans rôle métier actif.
+/// Cas typique : nouveau membre créé par un administrateur, en attente d'activation.
class VisitorDashboard extends StatelessWidget {
const VisitorDashboard({super.key});
@override
Widget build(BuildContext context) {
+ final authState = context.watch().state;
+ final email = authState is AuthAuthenticated ? authState.user.email : '';
+ final firstName = authState is AuthAuthenticated ? authState.user.firstName : '';
+
return Scaffold(
backgroundColor: UnionFlowColors.background,
- appBar: _buildAppBar(),
- drawer: DashboardDrawer(
- onNavigate: (route) {
- Navigator.of(context).pushNamed(route);
- },
- onLogout: () {
- context.read().add(const AuthLogoutRequested());
- },
- ),
- body: AfricanPatternBackground(
- child: SingleChildScrollView(
- padding: const EdgeInsets.all(12),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- // Message de bienvenue
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 100),
- child: _buildWelcomeCard(),
- ),
- const SizedBox(height: 12),
+ appBar: _buildAppBar(context),
+ body: SingleChildScrollView(
+ padding: const EdgeInsets.all(20),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ const SizedBox(height: 24),
- // Fonctionnalités UnionFlow
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 200),
- child: const Text(
- 'Découvrez UnionFlow',
- style: TextStyle(
- fontSize: 13,
- fontWeight: FontWeight.w700,
- color: UnionFlowColors.textPrimary,
- ),
+ // Icône centrale
+ Container(
+ width: 80,
+ height: 80,
+ decoration: BoxDecoration(
+ color: UnionFlowColors.gold.withOpacity(0.12),
+ shape: BoxShape.circle,
+ ),
+ child: const Icon(
+ Icons.hourglass_empty_rounded,
+ size: 40,
+ color: UnionFlowColors.gold,
+ ),
+ ),
+ const SizedBox(height: 20),
+
+ // Titre
+ Text(
+ firstName.isNotEmpty ? 'Bonjour $firstName,' : 'Bienvenue,',
+ style: const TextStyle(
+ fontSize: 20,
+ fontWeight: FontWeight.w800,
+ color: UnionFlowColors.textPrimary,
+ ),
+ textAlign: TextAlign.center,
+ ),
+ const SizedBox(height: 8),
+ const Text(
+ 'Votre compte est en attente d\'activation',
+ style: TextStyle(
+ fontSize: 15,
+ fontWeight: FontWeight.w600,
+ color: UnionFlowColors.textPrimary,
+ ),
+ textAlign: TextAlign.center,
+ ),
+ const SizedBox(height: 12),
+
+ // Email
+ if (email.isNotEmpty)
+ Container(
+ padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 8),
+ decoration: BoxDecoration(
+ color: UnionFlowColors.surface,
+ borderRadius: BorderRadius.circular(8),
+ border: Border.all(color: UnionFlowColors.border),
),
- ),
- const SizedBox(height: 8),
-
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 300),
child: Row(
+ mainAxisSize: MainAxisSize.min,
children: [
- Expanded(
- child: UnionStatWidget(
- label: 'Organisations',
- value: '500+',
- icon: Icons.business_outlined,
- color: UnionFlowColors.unionGreen,
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: UnionStatWidget(
- label: 'Utilisateurs',
- value: '10K+',
- icon: Icons.people_outlined,
- color: UnionFlowColors.gold,
+ const Icon(Icons.email_outlined, size: 14, color: UnionFlowColors.textSecondary),
+ const SizedBox(width: 6),
+ Text(
+ email,
+ style: const TextStyle(
+ fontSize: 13,
+ color: UnionFlowColors.textSecondary,
),
),
],
),
),
- const SizedBox(height: 12),
+ const SizedBox(height: 28),
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 400),
- child: Row(
- children: [
- Expanded(
- child: UnionStatWidget(
- label: 'Transactions',
- value: '1M+',
- icon: Icons.payment_outlined,
- color: UnionFlowColors.indigo,
- ),
+ // Message explicatif
+ Container(
+ width: double.infinity,
+ padding: const EdgeInsets.all(16),
+ decoration: BoxDecoration(
+ color: UnionFlowColors.surface,
+ borderRadius: BorderRadius.circular(12),
+ border: const Border(
+ left: BorderSide(color: UnionFlowColors.gold, width: 3),
+ ),
+ boxShadow: UnionFlowColors.softShadow,
+ ),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ const Text(
+ 'Que se passe-t-il ?',
+ style: TextStyle(
+ fontSize: 13,
+ fontWeight: FontWeight.w700,
+ color: UnionFlowColors.textPrimary,
),
- const SizedBox(width: 12),
- Expanded(
- child: UnionStatWidget(
- label: 'Confiance',
- value: '99%',
- icon: Icons.verified_outlined,
- color: UnionFlowColors.success,
- ),
- ),
- ],
- ),
- ),
- const SizedBox(height: 12),
-
- // Avantages
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 500),
- child: const Text(
- 'Nos Avantages',
- style: TextStyle(
- fontSize: 13,
- fontWeight: FontWeight.w700,
- color: UnionFlowColors.textPrimary,
),
- ),
- ),
- const SizedBox(height: 8),
-
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 600),
- child: _buildFeature(
- 'Gestion Simplifiée',
- 'Gérez vos cotisations, épargnes et crédits en un seul endroit',
- Icons.dashboard_customize,
- UnionFlowColors.unionGreen,
- ),
- ),
- const SizedBox(height: 12),
-
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 700),
- child: _buildFeature(
- 'Sécurité Optimale',
- 'Vos données sont protégées avec un chiffrement de niveau bancaire',
- Icons.security,
- UnionFlowColors.indigo,
- ),
- ),
- const SizedBox(height: 12),
-
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 800),
- child: _buildFeature(
- 'Solidarité Africaine',
- 'Entraide, tontines, mutuelles et coopératives à votre portée',
- Icons.favorite_outline,
- UnionFlowColors.terracotta,
- ),
- ),
- const SizedBox(height: 12),
-
- AnimatedFadeIn(
- delay: const Duration(milliseconds: 900),
- child: _buildFeature(
- 'Rapports Détaillés',
- 'Suivi en temps réel avec exports PDF, Excel et CSV',
- Icons.analytics_outlined,
- UnionFlowColors.gold,
- ),
- ),
- const SizedBox(height: 16),
-
- // Call to Action
- AnimatedSlideIn(
- delay: const Duration(milliseconds: 1000),
- child: Container(
- padding: const EdgeInsets.all(12),
- decoration: BoxDecoration(
- gradient: UnionFlowColors.primaryGradient,
- borderRadius: BorderRadius.circular(12),
+ const SizedBox(height: 8),
+ _buildStep(
+ '1',
+ 'Votre compte a été créé par l\'administrateur de votre organisation.',
+ UnionFlowColors.unionGreen,
),
- child: Column(
- children: [
- const Icon(
- Icons.rocket_launch,
- size: 24,
- color: Colors.white,
- ),
- const SizedBox(height: 8),
- const Text(
- 'Prêt à Commencer ?',
- style: TextStyle(
- fontSize: 15,
- fontWeight: FontWeight.w800,
- color: Colors.white,
- ),
- textAlign: TextAlign.center,
- ),
- const SizedBox(height: 4),
- Text(
- 'Rejoignez des milliers d\'organisations qui nous font confiance',
- style: TextStyle(
- fontSize: 11,
- color: Colors.white.withOpacity(0.9),
- ),
- textAlign: TextAlign.center,
- ),
- const SizedBox(height: 10),
- SizedBox(
- width: double.infinity,
- child: ElevatedButton(
- onPressed: () {
- Navigator.of(context).pushNamed('/login');
- },
- style: ElevatedButton.styleFrom(
- backgroundColor: Colors.white,
- foregroundColor: UnionFlowColors.unionGreen,
- padding: const EdgeInsets.symmetric(vertical: 10),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(8),
- ),
- elevation: 0,
- ),
- child: const Text(
- 'Créer un Compte',
- style: TextStyle(
- fontSize: 13,
- fontWeight: FontWeight.w800,
- ),
- ),
- ),
- ),
- const SizedBox(height: 6),
- TextButton(
- onPressed: () {
- Navigator.of(context).pushNamed('/login');
- },
- child: Text(
- 'Déjà membre ? Se connecter',
- style: TextStyle(
- fontSize: 11,
- fontWeight: FontWeight.w600,
- color: Colors.white.withOpacity(0.9),
- ),
- ),
- ),
- ],
+ const SizedBox(height: 8),
+ _buildStep(
+ '2',
+ 'Il doit être activé par un administrateur avant que vous puissiez accéder à la plateforme.',
+ UnionFlowColors.gold,
),
+ const SizedBox(height: 8),
+ _buildStep(
+ '3',
+ 'Une fois activé, reconnectez-vous pour accéder à votre espace.',
+ UnionFlowColors.indigo,
+ ),
+ ],
+ ),
+ ),
+ const SizedBox(height: 20),
+
+ // Bouton actualiser
+ SizedBox(
+ width: double.infinity,
+ child: ElevatedButton.icon(
+ onPressed: () {
+ context.read().add(const AuthStatusChecked());
+ },
+ icon: const Icon(Icons.refresh_rounded, size: 18),
+ label: const Text(
+ 'Vérifier l\'état de mon compte',
+ style: TextStyle(fontSize: 14, fontWeight: FontWeight.w700),
+ ),
+ style: ElevatedButton.styleFrom(
+ backgroundColor: UnionFlowColors.unionGreen,
+ foregroundColor: Colors.white,
+ padding: const EdgeInsets.symmetric(vertical: 14),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+ elevation: 0,
),
),
- ],
- ),
+ ),
+ const SizedBox(height: 12),
+
+ // Bouton déconnexion
+ SizedBox(
+ width: double.infinity,
+ child: OutlinedButton.icon(
+ onPressed: () {
+ context.read().add(const AuthLogoutRequested());
+ },
+ icon: const Icon(Icons.logout_rounded, size: 18),
+ label: const Text(
+ 'Se déconnecter',
+ style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600),
+ ),
+ style: OutlinedButton.styleFrom(
+ foregroundColor: UnionFlowColors.textSecondary,
+ side: const BorderSide(color: UnionFlowColors.border),
+ padding: const EdgeInsets.symmetric(vertical: 14),
+ shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
+ ),
+ ),
+ ),
+
+ const SizedBox(height: 32),
+ ],
),
),
);
}
- PreferredSizeWidget _buildAppBar() {
+ PreferredSizeWidget _buildAppBar(BuildContext context) {
return AppBar(
backgroundColor: UnionFlowColors.surface,
elevation: 0,
+ automaticallyImplyLeading: false,
title: Row(
children: [
- Hero(
- tag: 'unionflow_logo',
- child: Container(
- width: 32,
- height: 32,
- decoration: BoxDecoration(
- gradient: UnionFlowColors.primaryGradient,
- borderRadius: BorderRadius.circular(8),
- ),
- alignment: Alignment.center,
- child: const Text(
- 'U',
- style: TextStyle(
- color: Colors.white,
- fontWeight: FontWeight.w900,
- fontSize: 18,
- ),
+ Container(
+ width: 32,
+ height: 32,
+ decoration: BoxDecoration(
+ gradient: UnionFlowColors.primaryGradient,
+ borderRadius: BorderRadius.circular(8),
+ ),
+ alignment: Alignment.center,
+ child: const Text(
+ 'U',
+ style: TextStyle(
+ color: Colors.white,
+ fontWeight: FontWeight.w900,
+ fontSize: 18,
),
),
),
@@ -282,7 +222,7 @@ class VisitorDashboard extends StatelessWidget {
),
),
Text(
- 'Découverte',
+ 'Compte en attente',
style: TextStyle(
fontSize: 11,
fontWeight: FontWeight.w400,
@@ -297,120 +237,39 @@ class VisitorDashboard extends StatelessWidget {
);
}
- Widget _buildWelcomeCard() {
- return Container(
- padding: const EdgeInsets.all(10),
- decoration: BoxDecoration(
- gradient: UnionFlowColors.subtleGradient,
- borderRadius: BorderRadius.circular(10),
- border: const Border(
- top: BorderSide(color: UnionFlowColors.unionGreen, width: 3),
- ),
- boxShadow: UnionFlowColors.mediumShadow,
- ),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Row(
- children: [
- Container(
- padding: const EdgeInsets.all(7),
- decoration: BoxDecoration(
- gradient: UnionFlowColors.primaryGradient,
- borderRadius: BorderRadius.circular(8),
- ),
- child: const Icon(
- Icons.waving_hand,
- color: Colors.white,
- size: 16,
- ),
- ),
- const SizedBox(width: 16),
- const Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- 'Bienvenue sur UnionFlow',
- style: TextStyle(
- fontSize: 14,
- fontWeight: FontWeight.w800,
- color: UnionFlowColors.textPrimary,
- ),
- ),
- SizedBox(height: 4),
- Text(
- 'Votre plateforme de gestion mutualiste et associative',
- style: TextStyle(
- fontSize: 11,
- color: UnionFlowColors.textSecondary,
- ),
- ),
- ],
- ),
- ),
- ],
+ Widget _buildStep(String number, String text, Color color) {
+ return Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Container(
+ width: 22,
+ height: 22,
+ decoration: BoxDecoration(
+ color: color,
+ shape: BoxShape.circle,
),
- const SizedBox(height: 8),
- Text(
- 'Gérez vos mutuelles, tontines, coopératives et associations en toute simplicité. UnionFlow est la solution complète pour la solidarité africaine.',
- style: TextStyle(
+ alignment: Alignment.center,
+ child: Text(
+ number,
+ style: const TextStyle(
+ fontSize: 11,
+ fontWeight: FontWeight.w800,
+ color: Colors.white,
+ ),
+ ),
+ ),
+ const SizedBox(width: 10),
+ Expanded(
+ child: Text(
+ text,
+ style: const TextStyle(
fontSize: 12,
height: 1.5,
- color: UnionFlowColors.textPrimary.withOpacity(0.8),
+ color: UnionFlowColors.textSecondary,
),
),
- ],
- ),
- );
- }
-
- Widget _buildFeature(String title, String description, IconData icon, Color color) {
- return Container(
- padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
- decoration: BoxDecoration(
- color: UnionFlowColors.surface,
- borderRadius: BorderRadius.circular(8),
- border: Border(
- left: BorderSide(color: color, width: 3),
),
- ),
- child: Row(
- children: [
- Container(
- padding: const EdgeInsets.all(7),
- decoration: BoxDecoration(
- color: color.withOpacity(0.1),
- borderRadius: BorderRadius.circular(8),
- ),
- child: Icon(icon, color: color, size: 15),
- ),
- const SizedBox(width: 16),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- title,
- style: const TextStyle(
- fontSize: 14,
- fontWeight: FontWeight.w700,
- color: UnionFlowColors.textPrimary,
- ),
- ),
- const SizedBox(height: 4),
- Text(
- description,
- style: const TextStyle(
- fontSize: 12,
- color: UnionFlowColors.textSecondary,
- ),
- ),
- ],
- ),
- ),
- ],
- ),
+ ],
);
}
}
diff --git a/lib/features/dashboard/presentation/widgets/navigation/dashboard_navigation.dart b/lib/features/dashboard/presentation/widgets/navigation/dashboard_navigation.dart
deleted file mode 100644
index 4fc71ad..0000000
--- a/lib/features/dashboard/presentation/widgets/navigation/dashboard_navigation.dart
+++ /dev/null
@@ -1,416 +0,0 @@
-import 'package:flutter/material.dart';
-import '../../../../../shared/design_system/unionflow_design_system.dart';
-import '../../pages/connected_dashboard_page.dart';
-import '../../pages/advanced_dashboard_page.dart';
-import '../../../../settings/presentation/pages/language_settings_page.dart';
-import '../../../../settings/presentation/pages/system_settings_page.dart';
-import '../../../../reports/presentation/pages/reports_page_wrapper.dart';
-import '../../../../members/presentation/pages/members_page_wrapper.dart';
-import '../../../../events/presentation/pages/events_page_wrapper.dart';
-import '../../../../contributions/presentation/pages/contributions_page_wrapper.dart';
-
-/// Widget de navigation pour les différents types de dashboard
-class DashboardNavigation extends StatefulWidget {
- final String organizationId;
- final String userId;
-
- const DashboardNavigation({
- super.key,
- required this.organizationId,
- required this.userId,
- });
-
- @override
- State createState() => _DashboardNavigationState();
-}
-
-class _DashboardNavigationState extends State {
- int _currentIndex = 0;
-
- final List _tabs = [
- const DashboardTab(
- title: 'Accueil',
- icon: Icons.home,
- activeIcon: Icons.home,
- type: DashboardType.home,
- ),
- const DashboardTab(
- title: 'Analytics',
- icon: Icons.analytics_outlined,
- activeIcon: Icons.analytics,
- type: DashboardType.analytics,
- ),
- const DashboardTab(
- title: 'Rapports',
- icon: Icons.assessment_outlined,
- activeIcon: Icons.assessment,
- type: DashboardType.reports,
- ),
- const DashboardTab(
- title: 'Paramètres',
- icon: Icons.settings_outlined,
- activeIcon: Icons.settings,
- type: DashboardType.settings,
- ),
- ];
-
- @override
- Widget build(BuildContext context) {
- return Scaffold(
- body: _buildCurrentPage(),
- bottomNavigationBar: _buildBottomNavigationBar(),
- floatingActionButton: _buildFloatingActionButton(),
- floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
- );
- }
-
- Widget _buildCurrentPage() {
- switch (_tabs[_currentIndex].type) {
- case DashboardType.home:
- return ConnectedDashboardPage(
- organizationId: widget.organizationId,
- userId: widget.userId,
- );
- case DashboardType.analytics:
- return AdvancedDashboardPage(
- organizationId: widget.organizationId,
- userId: widget.userId,
- );
- case DashboardType.reports:
- return _buildReportsPage();
- case DashboardType.settings:
- return _buildSettingsPage();
- }
- }
-
- Widget _buildBottomNavigationBar() {
- return Container(
- decoration: BoxDecoration(
- color: Theme.of(context).cardColor,
- boxShadow: [
- BoxShadow(
- color: Colors.black.withOpacity(0.05),
- blurRadius: 10,
- offset: const Offset(0, -2),
- ),
- ],
- ),
- child: BottomAppBar(
- shape: const CircularNotchedRectangle(),
- notchMargin: 8,
- color: Theme.of(context).cardColor,
- elevation: 0,
- child: Padding(
- padding: const EdgeInsets.symmetric(horizontal: 8),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: _tabs.asMap().entries.map((entry) {
- final index = entry.key;
- final tab = entry.value;
- final isActive = index == _currentIndex;
-
- // Skip the middle item for FAB space
- if (index == 2) {
- return const SizedBox(width: 40);
- }
-
- return _buildNavItem(tab, isActive, index);
- }).toList(),
- ),
- ),
- ),
- );
- }
-
- Widget _buildNavItem(DashboardTab tab, bool isActive, int index) {
- return GestureDetector(
- onTap: () => setState(() => _currentIndex = index),
- child: Container(
- padding: const EdgeInsets.symmetric(
- vertical: 8,
- horizontal: 16,
- ),
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- Icon(
- isActive ? tab.activeIcon : tab.icon,
- color: isActive ? AppColors.primaryGreen : AppColors.textSecondaryLight,
- size: 20,
- ),
- const SizedBox(height: 4),
- Text(
- tab.title,
- style: AppTypography.badgeText.copyWith(
- color: isActive ? AppColors.primaryGreen : AppColors.textSecondaryLight,
- fontWeight: isActive ? FontWeight.bold : FontWeight.normal,
- fontSize: 9,
- ),
- ),
- ],
- ),
- ),
- );
- }
-
- Widget _buildFloatingActionButton() {
- return FloatingActionButton(
- onPressed: _showQuickActions,
- backgroundColor: AppColors.primaryGreen,
- elevation: 4,
- child: const Icon(
- Icons.add_outlined,
- color: Colors.white,
- size: 28,
- ),
- );
- }
-
- Widget _buildReportsPage() {
- return Scaffold(
- appBar: AppBar(
- title: Text('Rapports'.toUpperCase(), style: AppTypography.subtitleSmall.copyWith(fontWeight: FontWeight.bold, color: Colors.white, letterSpacing: 1.1)),
- backgroundColor: AppColors.primaryGreen,
- foregroundColor: Colors.white,
- automaticallyImplyLeading: false,
- ),
- body: Center(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- const Icon(
- Icons.assessment_outlined,
- size: 48,
- color: AppColors.textSecondaryLight,
- ),
- const SizedBox(height: 16),
- Text(
- 'Page Rapports'.toUpperCase(),
- style: AppTypography.subtitleSmall.copyWith(fontWeight: FontWeight.bold),
- ),
- const SizedBox(height: 8),
- Text(
- 'En cours de développement',
- style: AppTypography.bodyTextSmall.copyWith(
- color: AppColors.textSecondaryLight,
- ),
- ),
- ],
- ),
- ),
- );
- }
-
- Widget _buildSettingsPage() {
- return Scaffold(
- appBar: AppBar(
- title: Text('Paramètres'.toUpperCase(), style: AppTypography.subtitleSmall.copyWith(fontWeight: FontWeight.bold, color: Colors.white, letterSpacing: 1.1)),
- backgroundColor: AppColors.primaryGreen,
- foregroundColor: Colors.white,
- automaticallyImplyLeading: false,
- ),
- body: ListView(
- padding: const EdgeInsets.all(16),
- children: [
- _buildSettingsSection(
- 'Apparence',
- [
- _buildSettingsTile(
- 'Thème',
- 'Design System UnionFlow',
- Icons.palette_outlined,
- () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const SystemSettingsPage())),
- ),
- _buildSettingsTile(
- 'Langue',
- 'Français',
- Icons.language_outlined,
- () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const LanguageSettingsPage())),
- ),
- ],
- ),
- const SizedBox(height: 24),
- _buildSettingsSection(
- 'Notifications',
- [
- _buildSettingsTile(
- 'Notifications push',
- 'Activées',
- Icons.notifications_outlined,
- () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const SystemSettingsPage())),
- ),
- _buildSettingsTile(
- 'Emails',
- 'Quotidien',
- Icons.email_outlined,
- () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const SystemSettingsPage())),
- ),
- ],
- ),
- const SizedBox(height: 24),
- _buildSettingsSection(
- 'Données',
- [
- _buildSettingsTile(
- 'Synchronisation',
- 'Automatique',
- Icons.sync_outlined,
- () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const SystemSettingsPage())),
- ),
- _buildSettingsTile(
- 'Cache',
- 'Vider le cache',
- Icons.storage_outlined,
- () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const SystemSettingsPage())),
- ),
- ],
- ),
- ],
- ),
- );
- }
-
- Widget _buildSettingsSection(String title, List children) {
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- title.toUpperCase(),
- style: AppTypography.subtitleSmall.copyWith(fontWeight: FontWeight.bold, color: AppColors.primaryGreen, fontSize: 10),
- ),
- const SizedBox(height: 12),
- Container(
- decoration: BoxDecoration(
- color: Theme.of(context).cardColor,
- borderRadius: BorderRadius.circular(12),
- border: Border.all(color: AppColors.lightBorder),
- ),
- child: Column(children: children),
- ),
- ],
- );
- }
-
- Widget _buildSettingsTile(
- String title,
- String subtitle,
- IconData icon,
- VoidCallback onTap,
- ) {
- return ListTile(
- leading: Icon(icon, color: AppColors.primaryGreen, size: 20),
- title: Text(title, style: AppTypography.actionText.copyWith(fontSize: 13)),
- subtitle: Text(subtitle, style: AppTypography.subtitleSmall.copyWith(fontSize: 10)),
- trailing: const Icon(
- Icons.chevron_right_outlined,
- color: AppColors.textSecondaryLight,
- size: 16,
- ),
- onTap: onTap,
- );
- }
-
- void _showQuickActions() {
- showModalBottomSheet(
- context: context,
- backgroundColor: Colors.transparent,
- builder: (context) => Container(
- decoration: BoxDecoration(
- color: Theme.of(context).cardColor,
- borderRadius: const BorderRadius.only(
- topLeft: Radius.circular(16),
- topRight: Radius.circular(16),
- ),
- ),
- padding: const EdgeInsets.all(20),
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- Container(
- width: 40,
- height: 4,
- decoration: BoxDecoration(
- color: AppColors.lightBorder,
- borderRadius: BorderRadius.circular(2),
- ),
- ),
- const SizedBox(height: 20),
- Text(
- 'ACTIONS RAPIDES',
- style: AppTypography.subtitleSmall.copyWith(fontWeight: FontWeight.bold, letterSpacing: 1.1),
- ),
- const SizedBox(height: 20),
- GridView.count(
- crossAxisCount: 3,
- shrinkWrap: true,
- physics: const NeverScrollableScrollPhysics(),
- crossAxisSpacing: 12,
- mainAxisSpacing: 12,
- children: [
- _buildQuickActionItem(context, 'Nouveau\nMembre', Icons.person_add_outlined, AppColors.success, () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const MembersPageWrapper()))),
- _buildQuickActionItem(context, 'Créer\nÉvénement', Icons.event_available_outlined, AppColors.primaryGreen, () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const EventsPageWrapper()))),
- _buildQuickActionItem(context, 'Ajouter\nContribution', Icons.account_balance_wallet_outlined, AppColors.brandGreen, () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const ContributionsPageWrapper()))),
- _buildQuickActionItem(context, 'Générer\nRapport', Icons.assessment_outlined, AppColors.info, () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const ReportsPageWrapper()))),
- _buildQuickActionItem(context, 'Paramètres', Icons.settings_outlined, AppColors.textSecondaryLight, () => Navigator.of(context).push(MaterialPageRoute(builder: (_) => const SystemSettingsPage()))),
- ],
- ),
- const SizedBox(height: 20),
- ],
- ),
- ),
- );
- }
-
- Widget _buildQuickActionItem(BuildContext context, String title, IconData icon, Color color, VoidCallback onNavigate) {
- return GestureDetector(
- onTap: () {
- Navigator.pop(context);
- onNavigate();
- },
- child: Container(
- decoration: BoxDecoration(
- color: color.withOpacity(0.1),
- borderRadius: BorderRadius.circular(12),
- ),
- padding: const EdgeInsets.all(12),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Icon(icon, color: color, size: 20),
- const SizedBox(height: 8),
- Text(
- title,
- style: AppTypography.subtitleSmall.copyWith(
- color: AppColors.textPrimaryLight,
- fontSize: 9,
- fontWeight: FontWeight.w500,
- ),
- textAlign: TextAlign.center,
- ),
- ],
- ),
- ),
- );
- }
-}
-
-class DashboardTab {
- final String title;
- final IconData icon;
- final IconData activeIcon;
- final DashboardType type;
-
- const DashboardTab({
- required this.title,
- required this.icon,
- required this.activeIcon,
- required this.type,
- });
-}
-
-enum DashboardType {
- home,
- analytics,
- reports,
- settings,
-}
diff --git a/lib/features/events/bloc/evenements_bloc.dart b/lib/features/events/bloc/evenements_bloc.dart
index 5bda5dc..590cac3 100644
--- a/lib/features/events/bloc/evenements_bloc.dart
+++ b/lib/features/events/bloc/evenements_bloc.dart
@@ -81,12 +81,7 @@ class EvenementsBloc extends Bloc {
totalPages: result.totalPages,
));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -115,12 +110,7 @@ class EvenementsBloc extends Bloc {
));
}
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -151,11 +141,7 @@ class EvenementsBloc extends Bloc {
code: '400',
));
} else {
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
}
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
@@ -187,11 +173,7 @@ class EvenementsBloc extends Bloc {
code: '400',
));
} else {
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
}
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
@@ -214,12 +196,7 @@ class EvenementsBloc extends Bloc {
emit(EvenementDeleted(event.id));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -250,12 +227,7 @@ class EvenementsBloc extends Bloc {
totalPages: result.totalPages,
));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -286,12 +258,7 @@ class EvenementsBloc extends Bloc {
totalPages: result.totalPages,
));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -322,12 +289,7 @@ class EvenementsBloc extends Bloc {
totalPages: result.totalPages,
));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -349,12 +311,7 @@ class EvenementsBloc extends Bloc {
emit(EvenementInscrit(event.evenementId));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -376,12 +333,7 @@ class EvenementsBloc extends Bloc {
emit(EvenementDesinscrit(event.evenementId));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -406,12 +358,7 @@ class EvenementsBloc extends Bloc {
participants: participants,
));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -433,12 +380,7 @@ class EvenementsBloc extends Bloc {
emit(EvenementsStatsLoaded(stats));
} on DioException catch (e) {
- if (e.type == DioExceptionType.cancel) return;
- emit(EvenementsNetworkError(
- message: _getNetworkErrorMessage(e),
- code: e.response?.statusCode.toString(),
- error: e,
- ));
+ _emitDioError(e, emit);
} catch (e) {
if (e is DioException && e.type == DioExceptionType.cancel) return;
emit(EvenementsError(
@@ -493,5 +435,24 @@ class EvenementsBloc extends Bloc {
return 'Erreur réseau inattendue.';
}
}
+
+ /// Émet le bon état selon le type d'erreur :
+ /// 401/403 → EvenementsError (autorisation), autres → EvenementsNetworkError (réseau).
+ void _emitDioError(DioException e, Emitter emit) {
+ if (e.type == DioExceptionType.cancel) return;
+ final statusCode = e.response?.statusCode;
+ if (statusCode == 401 || statusCode == 403) {
+ emit(EvenementsError(
+ message: _getNetworkErrorMessage(e),
+ error: e,
+ ));
+ } else {
+ emit(EvenementsNetworkError(
+ message: _getNetworkErrorMessage(e),
+ code: statusCode?.toString(),
+ error: e,
+ ));
+ }
+ }
}
diff --git a/lib/features/members/bloc/membres_bloc.dart b/lib/features/members/bloc/membres_bloc.dart
index 7736848..4e98abe 100644
--- a/lib/features/members/bloc/membres_bloc.dart
+++ b/lib/features/members/bloc/membres_bloc.dart
@@ -1,6 +1,7 @@
/// BLoC pour la gestion des membres
library membres_bloc;
+import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:dio/dio.dart';
import 'package:injectable/injectable.dart';
@@ -16,6 +17,8 @@ import '../domain/usecases/delete_member.dart' as uc;
import '../domain/usecases/search_members.dart';
import '../domain/usecases/get_member_stats.dart';
import '../domain/repositories/membre_repository.dart';
+import '../../../core/websocket/websocket_service.dart';
+import '../../../core/utils/logger.dart';
/// BLoC pour la gestion des membres (Clean Architecture)
@injectable
@@ -27,7 +30,10 @@ class MembresBloc extends Bloc {
final uc.DeleteMember _deleteMember;
final SearchMembers _searchMembers;
final GetMemberStats _getMemberStats;
- final IMembreRepository _repository; // Pour méthodes non-couvertes par use cases
+ final IMembreRepository _repository;
+ final WebSocketService _webSocketService;
+
+ StreamSubscription? _webSocketSubscription;
MembresBloc(
this._getMembers,
@@ -38,6 +44,7 @@ class MembresBloc extends Bloc {
this._searchMembers,
this._getMemberStats,
this._repository,
+ this._webSocketService,
) : super(const MembresInitial()) {
on(_onLoadMembres);
on(_onLoadMembreById);
@@ -50,6 +57,44 @@ class MembresBloc extends Bloc {
on(_onLoadActiveMembres);
on(_onLoadBureauMembres);
on(_onLoadMembresStats);
+ on(_onResetMotDePasse);
+ on(_onAffecterOrganisation);
+ on(_onInviterMembre);
+ on(_onActiverAdhesion);
+ on(_onSuspendrAdhesion);
+ on(_onRadierAdhesion);
+
+ _initWebSocketListener();
+ }
+
+ void _initWebSocketListener() {
+ _webSocketSubscription = _webSocketService.eventStream.listen(
+ (event) {
+ try {
+ if (event is MemberEvent) {
+ AppLogger.info('MembresBloc: MemberEvent reçu (${event.eventType}), refresh liste');
+ final currentState = state;
+ if (currentState is MembresLoaded && !isClosed) {
+ add(LoadMembres(
+ refresh: true,
+ organisationId: currentState.organisationId,
+ page: currentState.currentPage,
+ size: currentState.pageSize,
+ ));
+ }
+ }
+ } catch (e, s) {
+ AppLogger.error('MembresBloc: erreur lors du traitement WebSocket event', error: e);
+ }
+ },
+ onError: (error) => AppLogger.error('MembresBloc: WebSocket stream error', error: error),
+ );
+ }
+
+ @override
+ Future close() {
+ _webSocketSubscription?.cancel();
+ return super.close();
}
/// Charge la liste des membres
@@ -68,11 +113,14 @@ class MembresBloc extends Bloc {
final MembreSearchResult result;
if (event.organisationId != null) {
- // OrgAdmin : scope la requête à son organisation via la recherche avancée
+ // OrgAdmin : scope la requête à son organisation via la recherche avancée.
+ // includeInactifs=true pour récupérer aussi les membres "En attente"
+ // (actif=false) — le filtrage par statut est géré côté UI.
result = await _searchMembers(
criteria: MembreSearchCriteria(
organisationIds: [event.organisationId!],
query: event.recherche?.isNotEmpty == true ? event.recherche : null,
+ includeInactifs: true,
),
page: event.page,
size: event.size,
@@ -298,6 +346,60 @@ class MembresBloc extends Bloc {
}
}
+ /// Réinitialise le mot de passe d'un membre
+ Future _onResetMotDePasse(
+ ResetMotDePasse event,
+ Emitter emit,
+ ) async {
+ try {
+ emit(const MembresLoading());
+
+ final membre = await _repository.resetMotDePasse(event.id);
+
+ emit(MotDePasseReinitialise(membre));
+ } on DioException catch (e) {
+ if (e.type == DioExceptionType.cancel) return;
+ emit(MembresNetworkError(
+ message: _getNetworkErrorMessage(e),
+ code: e.response?.statusCode.toString(),
+ error: e,
+ ));
+ } catch (e) {
+ if (e is DioException && e.type == DioExceptionType.cancel) return;
+ emit(MembresError(
+ message: 'Erreur lors de la réinitialisation du mot de passe. Veuillez réessayer.',
+ error: e,
+ ));
+ }
+ }
+
+ /// Affecte un membre à une organisation (superadmin)
+ Future _onAffecterOrganisation(
+ AffecterOrganisation event,
+ Emitter emit,
+ ) async {
+ try {
+ emit(const MembresLoading());
+
+ final membre = await _repository.affecterOrganisation(event.membreId, event.organisationId);
+
+ emit(MembreAffecte(membre));
+ } on DioException catch (e) {
+ if (e.type == DioExceptionType.cancel) return;
+ emit(MembresNetworkError(
+ message: _getNetworkErrorMessage(e),
+ code: e.response?.statusCode.toString(),
+ error: e,
+ ));
+ } catch (e) {
+ if (e is DioException && e.type == DioExceptionType.cancel) return;
+ emit(MembresError(
+ message: 'Erreur lors de l\'affectation à l\'organisation. Veuillez réessayer.',
+ error: e,
+ ));
+ }
+ }
+
/// Recherche avancée de membres
Future _onSearchMembres(
SearchMembres event,
@@ -479,5 +581,116 @@ class MembresBloc extends Bloc {
return 'Erreur réseau inattendue.';
}
}
+
+ // ── Handlers cycle de vie des adhésions ──────────────────────────────────
+
+ Future _onInviterMembre(
+ InviterMembre event,
+ Emitter emit,
+ ) async {
+ try {
+ emit(const MembresLoading());
+ final result = await _repository.inviterMembre(
+ event.membreId,
+ event.organisationId,
+ roleOrg: event.roleOrg,
+ );
+ emit(MembreInvite(
+ membreId: event.membreId,
+ organisationId: event.organisationId,
+ nouveauStatut: result['statut']?.toString() ?? 'INVITE',
+ ));
+ } on DioException catch (e) {
+ if (e.type == DioExceptionType.cancel) return;
+ emit(MembresNetworkError(
+ message: _getNetworkErrorMessage(e),
+ code: e.response?.statusCode.toString(),
+ error: e,
+ ));
+ } catch (e) {
+ emit(MembresError(message: 'Erreur lors de l\'invitation du membre.', error: e));
+ }
+ }
+
+ Future _onActiverAdhesion(
+ ActiverAdhesion event,
+ Emitter emit,
+ ) async {
+ try {
+ emit(const MembresLoading());
+ final result = await _repository.activerAdhesion(
+ event.membreId,
+ event.organisationId,
+ motif: event.motif,
+ );
+ emit(AdhesionActivee(
+ membreId: event.membreId,
+ nouveauStatut: result['statut']?.toString() ?? 'ACTIF',
+ ));
+ } on DioException catch (e) {
+ if (e.type == DioExceptionType.cancel) return;
+ emit(MembresNetworkError(
+ message: _getNetworkErrorMessage(e),
+ code: e.response?.statusCode.toString(),
+ error: e,
+ ));
+ } catch (e) {
+ emit(MembresError(message: 'Erreur lors de l\'activation de l\'adhésion.', error: e));
+ }
+ }
+
+ Future _onSuspendrAdhesion(
+ SuspendrAdhesion event,
+ Emitter emit,
+ ) async {
+ try {
+ emit(const MembresLoading());
+ final result = await _repository.suspendrAdhesion(
+ event.membreId,
+ event.organisationId,
+ motif: event.motif,
+ );
+ emit(AdhesionSuspendue(
+ membreId: event.membreId,
+ nouveauStatut: result['statut']?.toString() ?? 'SUSPENDU',
+ ));
+ } on DioException catch (e) {
+ if (e.type == DioExceptionType.cancel) return;
+ emit(MembresNetworkError(
+ message: _getNetworkErrorMessage(e),
+ code: e.response?.statusCode.toString(),
+ error: e,
+ ));
+ } catch (e) {
+ emit(MembresError(message: 'Erreur lors de la suspension de l\'adhésion.', error: e));
+ }
+ }
+
+ Future _onRadierAdhesion(
+ RadierAdhesion event,
+ Emitter emit,
+ ) async {
+ try {
+ emit(const MembresLoading());
+ final result = await _repository.radierAdhesion(
+ event.membreId,
+ event.organisationId,
+ motif: event.motif,
+ );
+ emit(MembreRadie(
+ membreId: event.membreId,
+ nouveauStatut: result['statut']?.toString() ?? 'RADIE',
+ ));
+ } on DioException catch (e) {
+ if (e.type == DioExceptionType.cancel) return;
+ emit(MembresNetworkError(
+ message: _getNetworkErrorMessage(e),
+ code: e.response?.statusCode.toString(),
+ error: e,
+ ));
+ } catch (e) {
+ emit(MembresError(message: 'Erreur lors de la radiation du membre.', error: e));
+ }
+ }
}
diff --git a/lib/features/members/bloc/membres_event.dart b/lib/features/members/bloc/membres_event.dart
index a154782..40f2c89 100644
--- a/lib/features/members/bloc/membres_event.dart
+++ b/lib/features/members/bloc/membres_event.dart
@@ -143,3 +143,90 @@ class LoadMembresStats extends MembresEvent {
const LoadMembresStats();
}
+/// Événement pour réinitialiser le mot de passe d'un membre existant
+class ResetMotDePasse extends MembresEvent {
+ final String id;
+
+ const ResetMotDePasse(this.id);
+
+ @override
+ List get props => [id];
+}
+
+/// Événement pour affecter un membre à une organisation (superadmin)
+class AffecterOrganisation extends MembresEvent {
+ final String membreId;
+ final String organisationId;
+
+ const AffecterOrganisation(this.membreId, this.organisationId);
+
+ @override
+ List get props => [membreId, organisationId];
+}
+
+// ── Cycle de vie des adhésions ────────────────────────────────────────────
+
+/// Inviter un membre dans une organisation (admin)
+class InviterMembre extends MembresEvent {
+ final String membreId;
+ final String organisationId;
+ final String? roleOrg;
+
+ const InviterMembre({
+ required this.membreId,
+ required this.organisationId,
+ this.roleOrg,
+ });
+
+ @override
+ List get props => [membreId, organisationId, roleOrg];
+}
+
+/// Activer l'adhésion d'un membre dans l'organisation courante
+class ActiverAdhesion extends MembresEvent {
+ final String membreId;
+ final String organisationId;
+ final String? motif;
+
+ const ActiverAdhesion({
+ required this.membreId,
+ required this.organisationId,
+ this.motif,
+ });
+
+ @override
+ List get props => [membreId, organisationId, motif];
+}
+
+/// Suspendre l'adhésion d'un membre
+class SuspendrAdhesion extends MembresEvent {
+ final String membreId;
+ final String organisationId;
+ final String? motif;
+
+ const SuspendrAdhesion({
+ required this.membreId,
+ required this.organisationId,
+ this.motif,
+ });
+
+ @override
+ List get props => [membreId, organisationId, motif];
+}
+
+/// Radier un membre d'une organisation
+class RadierAdhesion extends MembresEvent {
+ final String membreId;
+ final String organisationId;
+ final String? motif;
+
+ const RadierAdhesion({
+ required this.membreId,
+ required this.organisationId,
+ this.motif,
+ });
+
+ @override
+ List get props => [membreId, organisationId, motif];
+}
+
diff --git a/lib/features/members/bloc/membres_state.dart b/lib/features/members/bloc/membres_state.dart
index 677e854..4cd97b5 100644
--- a/lib/features/members/bloc/membres_state.dart
+++ b/lib/features/members/bloc/membres_state.dart
@@ -141,6 +141,78 @@ class MembreDeactivated extends MembresState {
List get props => [membre];
}
+/// État de succès après affectation à une organisation
+class MembreAffecte extends MembresState {
+ final MembreCompletModel membre;
+
+ const MembreAffecte(this.membre);
+
+ @override
+ List get props => [membre];
+}
+
+/// État de succès après réinitialisation du mot de passe
+/// [membre] contient motDePasseTemporaire renseigné (retourné une seule fois)
+class MotDePasseReinitialise extends MembresState {
+ final MembreCompletModel membre;
+
+ const MotDePasseReinitialise(this.membre);
+
+ @override
+ List get props => [membre];
+}
+
+// ── États cycle de vie adhésion ──────────────────────────────────────────
+
+/// Invitation envoyée avec succès
+class MembreInvite extends MembresState {
+ final String membreId;
+ final String organisationId;
+ final String nouveauStatut;
+
+ const MembreInvite({
+ required this.membreId,
+ required this.organisationId,
+ required this.nouveauStatut,
+ });
+
+ @override
+ List get props => [membreId, organisationId, nouveauStatut];
+}
+
+/// Adhésion activée
+class AdhesionActivee extends MembresState {
+ final String membreId;
+ final String nouveauStatut;
+
+ const AdhesionActivee({required this.membreId, required this.nouveauStatut});
+
+ @override
+ List get props => [membreId, nouveauStatut];
+}
+
+/// Adhésion suspendue
+class AdhesionSuspendue extends MembresState {
+ final String membreId;
+ final String nouveauStatut;
+
+ const AdhesionSuspendue({required this.membreId, required this.nouveauStatut});
+
+ @override
+ List get props => [membreId, nouveauStatut];
+}
+
+/// Membre radié
+class MembreRadie extends MembresState {
+ final String membreId;
+ final String nouveauStatut;
+
+ const MembreRadie({required this.membreId, required this.nouveauStatut});
+
+ @override
+ List get props => [membreId, nouveauStatut];
+}
+
/// État avec statistiques
class MembresStatsLoaded extends MembresState {
final Map stats;
diff --git a/lib/features/members/data/models/membre_complete_model.dart b/lib/features/members/data/models/membre_complete_model.dart
index 83f1e73..21cda2d 100644
--- a/lib/features/members/data/models/membre_complete_model.dart
+++ b/lib/features/members/data/models/membre_complete_model.dart
@@ -25,7 +25,7 @@ enum StatutMembre {
inactif,
@JsonValue('SUSPENDU')
suspendu,
- @JsonValue('EN_ATTENTE')
+ @JsonValue('EN_ATTENTE_VALIDATION')
enAttente,
}
@@ -67,6 +67,10 @@ class MembreCompletModel extends Equatable {
/// Téléphone
final String? telephone;
+ /// Téléphone Wave (mobile money)
+ @JsonKey(name: 'telephoneWave')
+ final String? telephoneWave;
+
/// Date de naissance
@JsonKey(name: 'dateNaissance')
final DateTime? dateNaissance;
@@ -100,6 +104,7 @@ class MembreCompletModel extends Equatable {
final String? photo;
/// Statut du membre
+ @JsonKey(name: 'statutCompte')
final StatutMembre statut;
/// Rôle dans l'organisation
@@ -148,6 +153,18 @@ class MembreCompletModel extends Equatable {
@JsonKey(name: 'derniereActivite')
final DateTime? derniereActivite;
+ /// Statut matrimonial (CELIBATAIRE, MARIE, DIVORCE, VEUF)
+ @JsonKey(name: 'statutMatrimonial')
+ final String? statutMatrimonial;
+
+ /// Type de pièce d'identité (CNI, PASSEPORT, PERMIS_CONDUIRE, TITRE_SEJOUR)
+ @JsonKey(name: 'typeIdentite')
+ final String? typeIdentite;
+
+ /// Numéro de pièce d'identité
+ @JsonKey(name: 'numeroIdentite')
+ final String? numeroIdentite;
+
/// Notes internes
final String? notes;
@@ -184,6 +201,7 @@ class MembreCompletModel extends Equatable {
required this.prenom,
required this.email,
this.telephone,
+ this.telephoneWave,
this.dateNaissance,
this.genre,
this.adresse,
@@ -207,6 +225,9 @@ class MembreCompletModel extends Equatable {
this.cotisationAJour = false,
this.nombreEvenementsParticipes = 0,
this.derniereActivite,
+ this.statutMatrimonial,
+ this.typeIdentite,
+ this.numeroIdentite,
this.notes,
this.dateCreation,
this.dateModification,
@@ -231,6 +252,7 @@ class MembreCompletModel extends Equatable {
String? prenom,
String? email,
String? telephone,
+ String? telephoneWave,
DateTime? dateNaissance,
Genre? genre,
String? adresse,
@@ -254,6 +276,9 @@ class MembreCompletModel extends Equatable {
bool? cotisationAJour,
int? nombreEvenementsParticipes,
DateTime? derniereActivite,
+ String? statutMatrimonial,
+ String? typeIdentite,
+ String? numeroIdentite,
String? notes,
DateTime? dateCreation,
DateTime? dateModification,
@@ -269,6 +294,7 @@ class MembreCompletModel extends Equatable {
prenom: prenom ?? this.prenom,
email: email ?? this.email,
telephone: telephone ?? this.telephone,
+ telephoneWave: telephoneWave ?? this.telephoneWave,
dateNaissance: dateNaissance ?? this.dateNaissance,
genre: genre ?? this.genre,
adresse: adresse ?? this.adresse,
@@ -292,6 +318,9 @@ class MembreCompletModel extends Equatable {
cotisationAJour: cotisationAJour ?? this.cotisationAJour,
nombreEvenementsParticipes: nombreEvenementsParticipes ?? this.nombreEvenementsParticipes,
derniereActivite: derniereActivite ?? this.derniereActivite,
+ statutMatrimonial: statutMatrimonial ?? this.statutMatrimonial,
+ typeIdentite: typeIdentite ?? this.typeIdentite,
+ numeroIdentite: numeroIdentite ?? this.numeroIdentite,
notes: notes ?? this.notes,
dateCreation: dateCreation ?? this.dateCreation,
dateModification: dateModification ?? this.dateModification,
@@ -341,6 +370,7 @@ class MembreCompletModel extends Equatable {
prenom,
email,
telephone,
+ telephoneWave,
dateNaissance,
genre,
adresse,
@@ -364,6 +394,9 @@ class MembreCompletModel extends Equatable {
cotisationAJour,
nombreEvenementsParticipes,
derniereActivite,
+ statutMatrimonial,
+ typeIdentite,
+ numeroIdentite,
notes,
dateCreation,
dateModification,
diff --git a/lib/features/members/data/models/membre_complete_model.g.dart b/lib/features/members/data/models/membre_complete_model.g.dart
index fa7dd8d..ebf25d7 100644
--- a/lib/features/members/data/models/membre_complete_model.g.dart
+++ b/lib/features/members/data/models/membre_complete_model.g.dart
@@ -13,6 +13,7 @@ MembreCompletModel _$MembreCompletModelFromJson(Map json) =>
prenom: json['prenom'] as String,
email: json['email'] as String,
telephone: json['telephone'] as String?,
+ telephoneWave: json['telephoneWave'] as String?,
dateNaissance: json['dateNaissance'] == null
? null
: DateTime.parse(json['dateNaissance'] as String),
@@ -25,7 +26,7 @@ MembreCompletModel _$MembreCompletModelFromJson(Map json) =>
profession: json['profession'] as String?,
nationalite: json['nationalite'] as String?,
photo: json['photo'] as String?,
- statut: $enumDecodeNullable(_$StatutMembreEnumMap, json['statut']) ??
+ statut: $enumDecodeNullable(_$StatutMembreEnumMap, json['statutCompte']) ??
StatutMembre.actif,
role: json['role'] as String?,
organisationId: json['organisationId'] as String?,
@@ -46,6 +47,9 @@ MembreCompletModel _$MembreCompletModelFromJson(Map json) =>
derniereActivite: json['derniereActivite'] == null
? null
: DateTime.parse(json['derniereActivite'] as String),
+ statutMatrimonial: json['statutMatrimonial'] as String?,
+ typeIdentite: json['typeIdentite'] as String?,
+ numeroIdentite: json['numeroIdentite'] as String?,
notes: json['notes'] as String?,
dateCreation: json['dateCreation'] == null
? null
@@ -70,6 +74,7 @@ Map _$MembreCompletModelToJson(MembreCompletModel instance) =>
'prenom': instance.prenom,
'email': instance.email,
'telephone': instance.telephone,
+ 'telephoneWave': instance.telephoneWave,
'dateNaissance': instance.dateNaissance?.toIso8601String(),
'genre': _$GenreEnumMap[instance.genre],
'adresse': instance.adresse,
@@ -80,7 +85,7 @@ Map _$MembreCompletModelToJson(MembreCompletModel instance) =>
'profession': instance.profession,
'nationalite': instance.nationalite,
'photo': instance.photo,
- 'statut': _$StatutMembreEnumMap[instance.statut]!,
+ 'statutCompte': _$StatutMembreEnumMap[instance.statut]!,
'role': instance.role,
'organisationId': instance.organisationId,
'organisationNom': instance.organisationNom,
@@ -93,6 +98,9 @@ Map _$MembreCompletModelToJson(MembreCompletModel instance) =>
'cotisationAJour': instance.cotisationAJour,
'nombreEvenementsParticipes': instance.nombreEvenementsParticipes,
'derniereActivite': instance.derniereActivite?.toIso8601String(),
+ 'statutMatrimonial': instance.statutMatrimonial,
+ 'typeIdentite': instance.typeIdentite,
+ 'numeroIdentite': instance.numeroIdentite,
'notes': instance.notes,
'dateCreation': instance.dateCreation?.toIso8601String(),
'dateModification': instance.dateModification?.toIso8601String(),
@@ -115,7 +123,7 @@ const _$StatutMembreEnumMap = {
StatutMembre.actif: 'ACTIF',
StatutMembre.inactif: 'INACTIF',
StatutMembre.suspendu: 'SUSPENDU',
- StatutMembre.enAttente: 'EN_ATTENTE',
+ StatutMembre.enAttente: 'EN_ATTENTE_VALIDATION',
};
const _$NiveauVigilanceKycEnumMap = {
diff --git a/lib/features/members/data/repositories/membre_repository_impl.dart b/lib/features/members/data/repositories/membre_repository_impl.dart
index 5a7d867..48eb3c8 100644
--- a/lib/features/members/data/repositories/membre_repository_impl.dart
+++ b/lib/features/members/data/repositories/membre_repository_impl.dart
@@ -240,7 +240,7 @@ class MembreRepositoryImpl implements IMembreRepository {
@override
Future activateMembre(String id) async {
try {
- final response = await _apiClient.post('$_baseUrl/$id/activer');
+ final response = await _apiClient.put('$_baseUrl/$id/activer');
if (response.statusCode == 200) {
return MembreCompletModel.fromJson(response.data as Map);
@@ -257,7 +257,7 @@ class MembreRepositoryImpl implements IMembreRepository {
@override
Future deactivateMembre(String id) async {
try {
- final response = await _apiClient.post('$_baseUrl/$id/desactiver');
+ final response = await _apiClient.put('$_baseUrl/$id/desactiver');
if (response.statusCode == 200) {
return MembreCompletModel.fromJson(response.data as Map);
@@ -339,5 +339,114 @@ class MembreRepositoryImpl implements IMembreRepository {
rethrow;
}
}
+
+ @override
+ Future resetMotDePasse(String id) async {
+ try {
+ final response = await _apiClient.put('$_baseUrl/$id/reinitialiser-mot-de-passe');
+
+ if (response.statusCode == 200) {
+ return MembreCompletModel.fromJson(response.data as Map);
+ } else {
+ throw Exception('Erreur lors de la réinitialisation du mot de passe: ${response.statusCode}');
+ }
+ } on DioException {
+ rethrow;
+ } catch (e) {
+ rethrow;
+ }
+ }
+
+ @override
+ Future affecterOrganisation(String membreId, String organisationId) async {
+ try {
+ final response = await _apiClient.put(
+ '$_baseUrl/$membreId/affecter-organisation',
+ queryParameters: {'organisationId': organisationId},
+ );
+
+ if (response.statusCode == 200) {
+ return MembreCompletModel.fromJson(response.data as Map);
+ } else {
+ throw Exception('Erreur lors de l\'affectation à l\'organisation: ${response.statusCode}');
+ }
+ } on DioException {
+ rethrow;
+ } catch (e) {
+ rethrow;
+ }
+ }
+
+ // ── Cycle de vie des adhésions ────────────────────────────────────────────
+
+ @override
+ Future> inviterMembre(
+ String membreId,
+ String organisationId, {
+ String? roleOrg,
+ }) async {
+ final response = await _apiClient.put(
+ '$_baseUrl/$membreId/inviter-organisation',
+ queryParameters: {
+ 'organisationId': organisationId,
+ if (roleOrg != null) 'roleOrg': roleOrg,
+ },
+ );
+ if (response.statusCode == 200) {
+ return Map.from(response.data as Map);
+ }
+ throw Exception('Invitation échouée: ${response.statusCode}');
+ }
+
+ @override
+ Future> activerAdhesion(
+ String membreId,
+ String organisationId, {
+ String? motif,
+ }) async {
+ final response = await _apiClient.put(
+ '$_baseUrl/$membreId/adhesion/activer',
+ queryParameters: {'organisationId': organisationId},
+ data: motif != null ? {'motif': motif} : {},
+ );
+ if (response.statusCode == 200) {
+ return Map.from(response.data as Map);
+ }
+ throw Exception('Activation échouée: ${response.statusCode}');
+ }
+
+ @override
+ Future> suspendrAdhesion(
+ String membreId,
+ String organisationId, {
+ String? motif,
+ }) async {
+ final response = await _apiClient.put(
+ '$_baseUrl/$membreId/adhesion/suspendre',
+ queryParameters: {'organisationId': organisationId},
+ data: motif != null ? {'motif': motif} : {},
+ );
+ if (response.statusCode == 200) {
+ return Map.from(response.data as Map);
+ }
+ throw Exception('Suspension échouée: ${response.statusCode}');
+ }
+
+ @override
+ Future> radierAdhesion(
+ String membreId,
+ String organisationId, {
+ String? motif,
+ }) async {
+ final response = await _apiClient.put(
+ '$_baseUrl/$membreId/adhesion/radier',
+ queryParameters: {'organisationId': organisationId},
+ data: motif != null ? {'motif': motif} : {},
+ );
+ if (response.statusCode == 200) {
+ return Map.from(response.data as Map);
+ }
+ throw Exception('Radiation échouée: ${response.statusCode}');
+ }
}
diff --git a/lib/features/members/domain/repositories/membre_repository.dart b/lib/features/members/domain/repositories/membre_repository.dart
index 29a4278..8812b6b 100644
--- a/lib/features/members/domain/repositories/membre_repository.dart
+++ b/lib/features/members/domain/repositories/membre_repository.dart
@@ -48,4 +48,24 @@ abstract class IMembreRepository {
/// Récupère les statistiques des membres
Future> getMembresStats();
+
+ /// Réinitialise le mot de passe d'un membre — retourne le membre avec motDePasseTemporaire
+ Future resetMotDePasse(String id);
+
+ /// Affecte un membre à une organisation (superadmin uniquement)
+ Future affecterOrganisation(String membreId, String organisationId);
+
+ // ── Cycle de vie des adhésions ───────────────────────────────────────────
+
+ /// Invite un membre dans une organisation (statut INVITE, token 7j)
+ Future> inviterMembre(String membreId, String organisationId, {String? roleOrg});
+
+ /// Active l'adhésion d'un membre (EN_ATTENTE/INVITE/SUSPENDU → ACTIF)
+ Future> activerAdhesion(String membreId, String organisationId, {String? motif});
+
+ /// Suspend l'adhésion d'un membre (ACTIF → SUSPENDU)
+ Future> suspendrAdhesion(String membreId, String organisationId, {String? motif});
+
+ /// Radie un membre d'une organisation
+ Future> radierAdhesion(String membreId, String organisationId, {String? motif});
}
diff --git a/lib/features/members/presentation/pages/members_page.dart b/lib/features/members/presentation/pages/members_page.dart
deleted file mode 100644
index b9c74a6..0000000
--- a/lib/features/members/presentation/pages/members_page.dart
+++ /dev/null
@@ -1,1981 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import '../../../../shared/design_system/tokens/app_colors.dart';
-import '../../../../shared/design_system/unionflow_design_system.dart';
-import '../../../../features/authentication/presentation/bloc/auth_bloc.dart';
-import '../../../../features/authentication/data/models/user_role.dart';
-import '../../../adhesions/presentation/pages/adhesions_page_wrapper.dart';
-
-/// Page de gestion des membres - Interface sophistiquée et exhaustive
-///
-/// Cette page offre une interface complète pour la gestion des membres
-/// avec des fonctionnalités avancées de recherche, filtrage, statistiques
-/// et actions de gestion basées sur les permissions utilisateur.
-class MembersPage extends StatefulWidget {
- const MembersPage({super.key});
-
- @override
- State createState() => _MembersPageState();
-}
-
-class _MembersPageState extends State with TickerProviderStateMixin {
- // Controllers et état
- final TextEditingController _searchController = TextEditingController();
- late TabController _tabController;
-
- // État de l'interface
- String _searchQuery = '';
- String _selectedFilter = 'Tous';
-
- bool _isGridView = false;
- bool _showAdvancedFilters = false;
-
- // Filtres avancés
- final List _selectedRoles = [];
-
- // Données de démonstration enrichies
- final List> _allMembers = [
- {
- 'id': '1',
- 'name': 'Marie Dubois',
- 'email': 'marie.dubois@unionflow.com',
- 'role': 'Membre Actif',
- 'status': 'Actif',
- 'joinDate': DateTime(2023, 1, 15),
- 'lastActivity': DateTime(2024, 9, 19),
- 'avatar': null,
- 'phone': '+33 6 12 34 56 78',
- 'department': 'Ressources Humaines',
- 'location': 'Paris, France',
- 'permissions': 15,
- 'contributionScore': 85,
- 'eventsAttended': 12,
- 'projectsInvolved': 5,
- },
- {
- 'id': '2',
- 'name': 'Pierre Martin',
- 'email': 'pierre.martin@unionflow.com',
- 'role': 'Modérateur',
- 'status': 'Actif',
- 'joinDate': DateTime(2022, 11, 20),
- 'lastActivity': DateTime(2024, 9, 20),
- 'avatar': null,
- 'phone': '+33 6 98 76 54 32',
- 'department': 'IT & Développement',
- 'location': 'Lyon, France',
- 'permissions': 25,
- 'contributionScore': 92,
- 'eventsAttended': 18,
- 'projectsInvolved': 8,
- },
- {
- 'id': '3',
- 'name': 'Sophie Laurent',
- 'email': 'sophie.laurent@unionflow.com',
- 'role': 'Membre Simple',
- 'status': 'Inactif',
- 'joinDate': DateTime(2024, 2, 10),
- 'lastActivity': DateTime(2024, 8, 15),
- 'avatar': null,
- 'phone': '+33 6 45 67 89 01',
- 'department': 'Marketing',
- 'location': 'Marseille, France',
- 'permissions': 8,
- 'contributionScore': 45,
- 'eventsAttended': 3,
- 'projectsInvolved': 1,
- },
- {
- 'id': '4',
- 'name': 'Thomas Durand',
- 'email': 'thomas.durand@unionflow.com',
- 'role': 'Administrateur Org',
- 'status': 'Actif',
- 'joinDate': DateTime(2021, 6, 5),
- 'lastActivity': DateTime(2024, 9, 20),
- 'avatar': null,
- 'phone': '+33 6 23 45 67 89',
- 'department': 'Administration',
- 'location': 'Toulouse, France',
- 'permissions': 35,
- 'contributionScore': 98,
- 'eventsAttended': 25,
- 'projectsInvolved': 12,
- },
- {
- 'id': '5',
- 'name': 'Emma Rousseau',
- 'email': 'emma.rousseau@unionflow.com',
- 'role': 'Gestionnaire RH',
- 'status': 'Actif',
- 'joinDate': DateTime(2023, 3, 12),
- 'lastActivity': DateTime(2024, 9, 19),
- 'avatar': null,
- 'phone': '+33 6 34 56 78 90',
- 'department': 'Ressources Humaines',
- 'location': 'Nantes, France',
- 'permissions': 28,
- 'contributionScore': 88,
- 'eventsAttended': 15,
- 'projectsInvolved': 7,
- },
- {
- 'id': '6',
- 'name': 'Lucas Bernard',
- 'email': 'lucas.bernard@unionflow.com',
- 'role': 'Consultant',
- 'status': 'En attente',
- 'joinDate': DateTime(2024, 9, 1),
- 'lastActivity': DateTime(2024, 9, 18),
- 'avatar': null,
- 'phone': '+33 6 56 78 90 12',
- 'department': 'Consulting',
- 'location': 'Bordeaux, France',
- 'permissions': 12,
- 'contributionScore': 0,
- 'eventsAttended': 0,
- 'projectsInvolved': 0,
- },
- {
- 'id': '7',
- 'name': 'Camille Moreau',
- 'email': 'camille.moreau@unionflow.com',
- 'role': 'Membre Actif',
- 'status': 'Suspendu',
- 'joinDate': DateTime(2022, 8, 30),
- 'lastActivity': DateTime(2024, 7, 10),
- 'avatar': null,
- 'phone': '+33 6 67 89 01 23',
- 'department': 'Ventes',
- 'location': 'Lille, France',
- 'permissions': 15,
- 'contributionScore': 65,
- 'eventsAttended': 8,
- 'projectsInvolved': 3,
- },
- ];
-
- @override
- void initState() {
- super.initState();
- _tabController = TabController(length: 4, vsync: this);
- }
-
- @override
- void dispose() {
- _searchController.dispose();
- _tabController.dispose();
- super.dispose();
- }
-
- @override
- Widget build(BuildContext context) {
- return BlocBuilder(
- builder: (context, state) {
- if (state is! AuthAuthenticated) {
- return Container(
- color: AppColors.lightBackground,
- child: const Center(child: CircularProgressIndicator()),
- );
- }
-
- return Container(
- color: AppColors.lightBackground,
- child: _buildMembersContent(state),
- );
- },
- );
- }
-
- /// Contenu principal de la page membres
- Widget _buildMembersContent(AuthAuthenticated state) {
- return SingleChildScrollView(
- padding: const EdgeInsets.all(12),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- // Header avec titre et actions
- _buildMembersHeader(state),
- const SizedBox(height: 8),
-
- // Statistiques et métriques
- _buildMembersMetrics(),
- const SizedBox(height: 8),
-
- // Barre de recherche et filtres
- _buildSearchAndFilters(),
- const SizedBox(height: 8),
-
- // Onglets de catégories
- _buildCategoryTabs(),
- const SizedBox(height: 8),
-
- // Liste/Grille des membres
- _buildMembersDisplay(),
- ],
- ),
- );
- }
-
- /// Header avec titre et actions principales
- Widget _buildMembersHeader(AuthAuthenticated state) {
- final canManageMembers = _canManageMembers(state.effectiveRole);
-
- return UFPageHeader(
- title: 'Membres',
- icon: Icons.people,
- iconColor: ColorTokens.primary,
- actions: canManageMembers
- ? [
- IconButton(
- icon: const Icon(Icons.checklist),
- onPressed: () => _showBulkActions(),
- tooltip: 'Actions groupées',
- ),
- IconButton(
- icon: const Icon(Icons.download),
- onPressed: () => _exportMembers(),
- tooltip: 'Exporter',
- ),
- IconButton(
- icon: const Icon(Icons.person_add),
- onPressed: () => _showAddMemberDialog(),
- tooltip: 'Ajouter un membre',
- ),
- ]
- : null,
- );
- }
-
- /// Section des métriques et statistiques
- Widget _buildMembersMetrics() {
- final totalMembers = _allMembers.length;
- final activeMembers = _allMembers.where((m) => m['status'] == 'Actif').length;
- final newThisMonth = _allMembers.where((m) {
- final joinDate = m['joinDate'] as DateTime;
- final now = DateTime.now();
- return joinDate.year == now.year && joinDate.month == now.month;
- }).length;
- final avgContribution = _allMembers.map((m) => m['contributionScore'] as int).reduce((a, b) => a + b) / totalMembers;
-
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text(
- 'Métriques & Statistiques',
- style: TextStyle(
- fontWeight: FontWeight.bold,
- color: AppColors.primaryGreen,
- fontSize: 14,
- ),
- ),
- const SizedBox(height: 12),
-
- // Première ligne de métriques
- Row(
- children: [
- Expanded(
- child: _buildMetricCard(
- 'Total Membres',
- totalMembers.toString(),
- '+$newThisMonth ce mois',
- Icons.people,
- AppColors.primaryGreen,
- trend: newThisMonth > 0 ? 'up' : 'stable',
- ),
- ),
- const SizedBox(width: 8),
- Expanded(
- child: _buildMetricCard(
- 'Membres Actifs',
- activeMembers.toString(),
- '${((activeMembers / totalMembers) * 100).toStringAsFixed(1)}%',
- Icons.check_circle,
- AppColors.success,
- trend: 'up',
- ),
- ),
- ],
- ),
- const SizedBox(height: 8),
-
- // Deuxième ligne de métriques
- Row(
- children: [
- Expanded(
- child: _buildMetricCard(
- 'Score Moyen',
- avgContribution.toStringAsFixed(0),
- 'Contribution',
- Icons.trending_up,
- AppColors.brandGreenLight,
- trend: 'up',
- ),
- ),
- const SizedBox(width: 8),
- Expanded(
- child: _buildMetricCard(
- 'Nouveaux',
- newThisMonth.toString(),
- 'Ce mois',
- Icons.new_releases,
- AppColors.warning,
- trend: newThisMonth > 0 ? 'up' : 'stable',
- ),
- ),
- ],
- ),
- ],
- );
- }
-
- /// Carte de métrique avec design sophistiqué
- Widget _buildMetricCard(
- String title,
- String value,
- String subtitle,
- IconData icon,
- Color color, {
- String trend = 'stable',
- }) {
- return Container(
- padding: const EdgeInsets.all(16),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withOpacity(0.05),
- blurRadius: 10,
- offset: const Offset(0, 2),
- ),
- ],
- ),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Row(
- children: [
- Container(
- padding: const EdgeInsets.all(8),
- decoration: BoxDecoration(
- color: color.withOpacity(0.1),
- borderRadius: BorderRadius.circular(8),
- ),
- child: Icon(icon, color: color, size: 20),
- ),
- const Spacer(),
- if (trend == 'up')
- const Icon(Icons.trending_up, color: Colors.green, size: 16)
- else if (trend == 'down')
- const Icon(Icons.trending_down, color: Colors.red, size: 16)
- else
- const Icon(Icons.trending_flat, color: Colors.grey, size: 16),
- ],
- ),
- const SizedBox(height: 12),
- Text(
- value,
- style: TextStyle(
- fontSize: 24,
- fontWeight: FontWeight.bold,
- color: color,
- ),
- ),
- const SizedBox(height: 4),
- Text(
- title,
- style: const TextStyle(
- fontSize: 12,
- fontWeight: FontWeight.w500,
- color: AppColors.textSecondaryLight,
- ),
- ),
- const SizedBox(height: 2),
- Text(
- subtitle,
- style: const TextStyle(
- fontSize: 10,
- color: AppColors.textSecondaryLight,
- ),
- ),
- ],
- ),
- );
- }
-
- /// Barre de recherche et filtres avancés
- Widget _buildSearchAndFilters() {
- return Column(
- children: [
- // Barre de recherche principale
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withOpacity(0.05),
- blurRadius: 10,
- offset: const Offset(0, 2),
- ),
- ],
- ),
- child: Row(
- children: [
- const Icon(Icons.search, color: AppColors.textSecondaryLight),
- const SizedBox(width: 12),
- Expanded(
- child: TextField(
- controller: _searchController,
- decoration: const InputDecoration(
- hintText: 'Rechercher par nom, email, département...',
- border: InputBorder.none,
- hintStyle: TextStyle(color: AppColors.textSecondaryLight),
- ),
- onChanged: (value) {
- setState(() {
- _searchQuery = value;
- });
- },
- ),
- ),
- if (_searchQuery.isNotEmpty)
- IconButton(
- onPressed: () {
- _searchController.clear();
- setState(() {
- _searchQuery = '';
- });
- },
- icon: const Icon(Icons.clear, color: AppColors.textSecondaryLight),
- ),
- const SizedBox(width: 8),
- Container(
- height: 32,
- width: 1,
- color: AppColors.lightBorder,
- ),
- const SizedBox(width: 8),
- IconButton(
- onPressed: () {
- setState(() {
- _showAdvancedFilters = !_showAdvancedFilters;
- });
- },
- icon: Icon(
- _showAdvancedFilters ? Icons.filter_list_off : Icons.filter_list,
- color: _showAdvancedFilters ? AppColors.primaryGreen : AppColors.textSecondaryLight,
- ),
- tooltip: 'Filtres avancés',
- ),
- IconButton(
- onPressed: () {
- setState(() {
- _isGridView = !_isGridView;
- });
- },
- icon: Icon(
- _isGridView ? Icons.view_list : Icons.grid_view,
- color: AppColors.textSecondaryLight,
- ),
- tooltip: _isGridView ? 'Vue liste' : 'Vue grille',
- ),
- ],
- ),
- ),
-
- // Filtres avancés (conditionnels)
- if (_showAdvancedFilters) ...[
- const SizedBox(height: 12),
- _buildAdvancedFilters(),
- ],
-
- // Barre de filtres rapides
- const SizedBox(height: 12),
- _buildQuickFilters(),
- ],
- );
- }
-
- /// Filtres rapides horizontaux
- Widget _buildQuickFilters() {
- final filters = ['Tous', 'Actifs', 'Inactifs', 'Nouveaux', 'Suspendus'];
-
- return SizedBox(
- height: 40,
- child: ListView.builder(
- scrollDirection: Axis.horizontal,
- itemCount: filters.length,
- itemBuilder: (context, index) {
- final filter = filters[index];
- final isSelected = _selectedFilter == filter;
-
- return Padding(
- padding: EdgeInsets.only(
- left: index == 0 ? 0 : 8,
- right: index == filters.length - 1 ? 0 : 0,
- ),
- child: FilterChip(
- label: Text(filter),
- selected: isSelected,
- onSelected: (selected) {
- setState(() {
- _selectedFilter = selected ? filter : 'Tous';
- });
- },
- backgroundColor: Colors.white,
- selectedColor: AppColors.primaryGreen.withOpacity(0.1),
- checkmarkColor: AppColors.primaryGreen,
- labelStyle: TextStyle(
- color: isSelected ? AppColors.primaryGreen : AppColors.textSecondaryLight,
- fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal,
- ),
- side: BorderSide(
- color: isSelected ? AppColors.primaryGreen : AppColors.lightBorder,
- ),
- ),
- );
- },
- ),
- );
- }
-
- /// Filtres avancés extensibles
- Widget _buildAdvancedFilters() {
- return Container(
- padding: const EdgeInsets.all(16),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- border: Border.all(color: AppColors.lightBorder),
- ),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text(
- 'Filtres Avancés',
- style: TextStyle(
- fontWeight: FontWeight.w600,
- color: AppColors.textPrimaryLight,
- ),
- ),
- const SizedBox(height: 12),
-
- // Filtre par rôles
- Wrap(
- spacing: 8,
- runSpacing: 8,
- children: [
- 'Membre Actif',
- 'Modérateur',
- 'Administrateur Org',
- 'Gestionnaire RH',
- 'Consultant',
- 'Membre Simple',
- ].map((role) {
- final isSelected = _selectedRoles.contains(role);
- return FilterChip(
- label: Text(role),
- selected: isSelected,
- onSelected: (selected) {
- setState(() {
- if (selected) {
- _selectedRoles.add(role);
- } else {
- _selectedRoles.remove(role);
- }
- });
- },
- backgroundColor: Colors.grey[50],
- selectedColor: AppColors.primaryGreen.withOpacity(0.1),
- checkmarkColor: AppColors.primaryGreen,
- labelStyle: TextStyle(
- color: isSelected ? AppColors.primaryGreen : AppColors.textSecondaryLight,
- fontSize: 12,
- ),
- side: BorderSide(
- color: isSelected ? AppColors.primaryGreen : AppColors.lightBorder,
- ),
- );
- }).toList(),
- ),
-
- const SizedBox(height: 12),
-
- // Actions de filtres
- Row(
- children: [
- TextButton.icon(
- onPressed: () {
- setState(() {
- _selectedRoles.clear();
- });
- },
- icon: const Icon(Icons.clear_all, size: 16),
- label: const Text('Réinitialiser'),
- style: TextButton.styleFrom(
- foregroundColor: AppColors.textSecondaryLight,
- ),
- ),
- const Spacer(),
- Text(
- '${_getFilteredMembers().length} résultat(s)',
- style: const TextStyle(
- color: AppColors.textSecondaryLight,
- fontSize: 12,
- ),
- ),
- ],
- ),
- ],
- ),
- );
- }
-
- /// Onglets de catégories
- Widget _buildCategoryTabs() {
- return Container(
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withOpacity(0.05),
- blurRadius: 10,
- offset: const Offset(0, 2),
- ),
- ],
- ),
- child: TabBar(
- controller: _tabController,
- tabs: const [
- Tab(text: 'Tous', icon: Icon(Icons.people, size: 18)),
- Tab(text: 'Actifs', icon: Icon(Icons.check_circle, size: 18)),
- Tab(text: 'Équipes', icon: Icon(Icons.groups, size: 18)),
- Tab(text: 'Analytics', icon: Icon(Icons.analytics, size: 18)),
- ],
- labelColor: AppColors.primaryGreen,
- unselectedLabelColor: AppColors.textSecondaryLight,
- indicatorColor: AppColors.primaryGreen,
- indicatorWeight: 3,
- labelStyle: const TextStyle(
- fontSize: 12,
- fontWeight: FontWeight.w600,
- ),
- unselectedLabelStyle: const TextStyle(
- fontSize: 12,
- fontWeight: FontWeight.normal,
- ),
- ),
- );
- }
-
- /// Affichage principal des membres (liste ou grille)
- Widget _buildMembersDisplay() {
- final filteredMembers = _getFilteredMembers();
-
- if (filteredMembers.isEmpty) {
- return _buildEmptyState();
- }
-
- return SizedBox(
- height: 600, // Hauteur fixe pour éviter les problèmes de layout
- child: TabBarView(
- controller: _tabController,
- children: [
- // Onglet "Tous"
- _buildMembersList(filteredMembers),
- // Onglet "Actifs"
- _buildMembersList(filteredMembers.where((m) => m['status'] == 'Actif').toList()),
- // Onglet "Équipes"
- _buildTeamsView(filteredMembers),
- // Onglet "Analytics"
- _buildAnalyticsView(filteredMembers),
- ],
- ),
- );
- }
-
- /// Liste des membres avec design sophistiqué
- Widget _buildMembersList(List> members) {
- if (_isGridView) {
- return _buildMembersGrid(members);
- }
-
- return ListView.builder(
- padding: const EdgeInsets.symmetric(vertical: 8),
- itemCount: members.length,
- itemBuilder: (context, index) {
- final member = members[index];
- return _buildMemberCard(member);
- },
- );
- }
-
- /// Grille des membres
- Widget _buildMembersGrid(List> members) {
- return GridView.builder(
- padding: const EdgeInsets.symmetric(vertical: 8),
- gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
- crossAxisCount: 2,
- childAspectRatio: 0.8,
- crossAxisSpacing: 8,
- mainAxisSpacing: 8,
- ),
- itemCount: members.length,
- itemBuilder: (context, index) {
- final member = members[index];
- return _buildMemberGridCard(member);
- },
- );
- }
-
- /// Carte de membre sophistiquée pour la vue liste
- Widget _buildMemberCard(Map member) {
-
- final joinDate = member['joinDate'] as DateTime;
- final lastActivity = member['lastActivity'] as DateTime;
- final contributionScore = member['contributionScore'] as int;
-
- return Container(
- margin: const EdgeInsets.only(bottom: 8),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withOpacity(0.05),
- blurRadius: 10,
- offset: const Offset(0, 2),
- ),
- ],
- ),
- child: InkWell(
- onTap: () => _showMemberDetails(member),
- borderRadius: BorderRadius.circular(12),
- child: Padding(
- padding: const EdgeInsets.all(16),
- child: Row(
- children: [
- // Avatar avec indicateur de statut
- Stack(
- children: [
- CircleAvatar(
- radius: 24,
- backgroundColor: _getStatusColor(member['status']).withOpacity(0.1),
- child: Text(
- member['name'][0].toUpperCase(),
- style: TextStyle(
- color: _getStatusColor(member['status']),
- fontWeight: FontWeight.bold,
- fontSize: 18,
- ),
- ),
- ),
- Positioned(
- bottom: 0,
- right: 0,
- child: Container(
- width: 12,
- height: 12,
- decoration: BoxDecoration(
- color: _getStatusColor(member['status']),
- shape: BoxShape.circle,
- border: Border.all(color: Colors.white, width: 2),
- ),
- ),
- ),
- ],
- ),
- const SizedBox(width: 12),
-
- // Informations principales
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Row(
- children: [
- Expanded(
- child: Text(
- member['name'],
- style: const TextStyle(
- fontWeight: FontWeight.w600,
- fontSize: 16,
- color: AppColors.textPrimaryLight,
- ),
- ),
- ),
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
- decoration: BoxDecoration(
- color: _getRoleColor(member['role']).withOpacity(0.1),
- borderRadius: BorderRadius.circular(8),
- ),
- child: Text(
- member['role'],
- style: TextStyle(
- fontSize: 10,
- fontWeight: FontWeight.w500,
- color: _getRoleColor(member['role']),
- ),
- ),
- ),
- ],
- ),
- const SizedBox(height: 4),
- Text(
- member['email'],
- style: const TextStyle(
- color: AppColors.textSecondaryLight,
- fontSize: 14,
- ),
- ),
- const SizedBox(height: 4),
- Row(
- children: [
- Icon(
- Icons.business,
- size: 12,
- color: Colors.grey[500],
- ),
- const SizedBox(width: 4),
- Text(
- member['department'],
- style: const TextStyle(
- fontSize: 12,
- color: AppColors.textSecondaryLight,
- ),
- ),
- const SizedBox(width: 12),
- const Icon(
- Icons.location_on,
- size: 12,
- color: AppColors.textSecondaryLight,
- ),
- const SizedBox(width: 4),
- Expanded(
- child: Text(
- member['location'],
- style: const TextStyle(
- fontSize: 12,
- color: AppColors.textSecondaryLight,
- ),
- overflow: TextOverflow.ellipsis,
- ),
- ),
- ],
- ),
- const SizedBox(height: 8),
- Row(
- children: [
- // Score de contribution
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
- decoration: BoxDecoration(
- color: _getScoreColor(contributionScore).withOpacity(0.1),
- borderRadius: BorderRadius.circular(6),
- ),
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Icon(
- Icons.star,
- size: 10,
- color: _getScoreColor(contributionScore),
- ),
- const SizedBox(width: 2),
- Text(
- contributionScore.toString(),
- style: TextStyle(
- fontSize: 10,
- fontWeight: FontWeight.w500,
- color: _getScoreColor(contributionScore),
- ),
- ),
- ],
- ),
- ),
- const SizedBox(width: 8),
- Text(
- 'Rejoint ${_formatDate(joinDate)}',
- style: const TextStyle(
- fontSize: 10,
- color: AppColors.textSecondaryLight,
- ),
- ),
- const Spacer(),
- Text(
- 'Actif ${_formatRelativeTime(lastActivity)}',
- style: const TextStyle(
- fontSize: 10,
- color: AppColors.textSecondaryLight,
- ),
- ),
- ],
- ),
- ],
- ),
- ),
-
- // Actions
- PopupMenuButton(
- onSelected: (value) => _handleMemberAction(value, member),
- itemBuilder: (context) => [
- const PopupMenuItem(
- value: 'view',
- child: Row(
- children: [
- Icon(Icons.visibility, size: 16),
- SizedBox(width: 8),
- Text('Voir le profil'),
- ],
- ),
- ),
- const PopupMenuItem(
- value: 'edit',
- child: Row(
- children: [
- Icon(Icons.edit, size: 16),
- SizedBox(width: 8),
- Text('Modifier'),
- ],
- ),
- ),
- const PopupMenuItem(
- value: 'message',
- child: Row(
- children: [
- Icon(Icons.message, size: 16),
- SizedBox(width: 8),
- Text('Envoyer un message'),
- ],
- ),
- ),
- const PopupMenuItem(
- value: 'delete',
- child: Row(
- children: [
- Icon(Icons.delete, size: 16, color: Colors.red),
- SizedBox(width: 8),
- Text('Supprimer', style: TextStyle(color: Colors.red)),
- ],
- ),
- ),
- ],
- child: Container(
- padding: const EdgeInsets.all(8),
- decoration: BoxDecoration(
- color: Colors.grey[50],
- borderRadius: BorderRadius.circular(8),
- ),
- child: const Icon(
- Icons.more_vert,
- size: 16,
- color: AppColors.textSecondaryLight,
- ),
- ),
- ),
- ],
- ),
- ),
- ),
- );
- }
-
- // ═══════════════════════════════════════════════════════════════════════════
- // MÉTHODES UTILITAIRES ET HELPERS
- // ═══════════════════════════════════════════════════════════════════════════
-
- /// Filtre les membres selon les critères sélectionnés
- List> _getFilteredMembers() {
- return _allMembers.where((member) {
- // Filtre par recherche textuelle
- if (_searchQuery.isNotEmpty) {
- final query = _searchQuery.toLowerCase();
- final name = member['name'].toString().toLowerCase();
- final email = member['email'].toString().toLowerCase();
- final department = member['department'].toString().toLowerCase();
-
- if (!name.contains(query) &&
- !email.contains(query) &&
- !department.contains(query)) {
- return false;
- }
- }
-
- // Filtre par statut rapide
- if (_selectedFilter != 'Tous') {
- switch (_selectedFilter) {
- case 'Actifs':
- if (member['status'] != 'Actif') return false;
- break;
- case 'Inactifs':
- if (member['status'] != 'Inactif') return false;
- break;
- case 'Nouveaux':
- final joinDate = member['joinDate'] as DateTime;
- final now = DateTime.now();
- final isNewThisMonth = joinDate.year == now.year && joinDate.month == now.month;
- if (!isNewThisMonth) return false;
- break;
- case 'Suspendus':
- if (member['status'] != 'Suspendu') return false;
- break;
- }
- }
-
- // Filtre par rôles sélectionnés
- if (_selectedRoles.isNotEmpty && !_selectedRoles.contains(member['role'])) {
- return false;
- }
-
- return true;
- }).toList();
- }
-
- /// Obtient la couleur selon le statut
- Color _getStatusColor(String status) {
- switch (status) {
- case 'Actif':
- return AppColors.success;
- case 'Inactif':
- return AppColors.textSecondaryLight;
- case 'Suspendu':
- return AppColors.error;
- case 'En attente':
- return AppColors.warning;
- default:
- return AppColors.textSecondaryLight;
- }
- }
-
- /// Obtient la couleur selon le rôle
- Color _getRoleColor(String role) {
- switch (role) {
- case 'Super Administrateur':
- return AppColors.brandGreen;
- case 'Administrateur Org':
- return AppColors.primaryGreen;
- case 'Gestionnaire RH':
- return AppColors.info;
- case 'Modérateur':
- return AppColors.brandGreenLight;
- case 'Membre Actif':
- return AppColors.primaryGreen;
- case 'Consultant':
- return AppColors.warning;
- case 'Membre Simple':
- return AppColors.textSecondaryLight;
- default:
- return AppColors.textSecondaryLight;
- }
- }
-
- /// Obtient la couleur selon le score de contribution
- Color _getScoreColor(int score) {
- if (score >= 90) return AppColors.success;
- if (score >= 70) return AppColors.brandGreenLight;
- if (score >= 50) return AppColors.warning;
- return AppColors.error;
- }
-
- /// Formate une date
- String _formatDate(DateTime date) {
- final months = [
- 'jan', 'fév', 'mar', 'avr', 'mai', 'jun',
- 'jul', 'aoû', 'sep', 'oct', 'nov', 'déc'
- ];
- return '${date.day} ${months[date.month - 1]} ${date.year}';
- }
-
- /// Formate un temps relatif
- String _formatRelativeTime(DateTime date) {
- final now = DateTime.now();
- final difference = now.difference(date);
-
- if (difference.inDays > 30) {
- return 'il y a ${(difference.inDays / 30).floor()} mois';
- } else if (difference.inDays > 0) {
- return 'il y a ${difference.inDays} jour${difference.inDays > 1 ? 's' : ''}';
- } else if (difference.inHours > 0) {
- return 'il y a ${difference.inHours}h';
- } else {
- return 'à l\'instant';
- }
- }
-
-
-
- /// Vérifie si l'utilisateur peut gérer les membres
- bool _canManageMembers(UserRole role) {
- return [
- UserRole.superAdmin,
- UserRole.orgAdmin,
- UserRole.moderator,
- ].contains(role);
- }
-
- // ═══════════════════════════════════════════════════════════════════════════
- // MÉTHODES D'ACTIONS ET DIALOGS
- // ═══════════════════════════════════════════════════════════════════════════
-
- /// Affiche le dialog d'ajout de membre
- void _showAddMemberDialog() {
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Ajouter un membre'),
- content: const Text(
- 'Pour enregistrer un nouveau membre, créez une adhésion depuis le module Adhésions.',
- ),
- actions: [
- TextButton(
- onPressed: () => Navigator.of(context).pop(),
- child: const Text('Fermer'),
- ),
- ElevatedButton(
- onPressed: () {
- Navigator.of(context).pop();
- Navigator.of(context).push(
- MaterialPageRoute(builder: (_) => const AdhesionsPageWrapper()),
- );
- },
- child: const Text('Créer une adhésion'),
- ),
- ],
- ),
- );
- }
-
- /// Affiche les actions groupées
- void _showBulkActions() {
- showModalBottomSheet(
- context: context,
- builder: (context) => SafeArea(
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- ListTile(
- leading: const Icon(Icons.file_download_outlined),
- title: const Text('Exporter la sélection'),
- onTap: () {
- Navigator.pop(context);
- _exportMembers();
- },
- ),
- ListTile(
- leading: const Icon(Icons.email_outlined),
- title: const Text('Envoyer un message groupé'),
- onTap: () {
- Navigator.pop(context);
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(
- content: Text('Messagerie groupée à venir. Utilisez l\'action « Message » sur un membre.'),
- backgroundColor: AppColors.primaryGreen,
- ),
- );
- },
- ),
- ],
- ),
- ),
- );
- }
-
- /// Exporte la liste des membres
- void _exportMembers() {
- ScaffoldMessenger.of(context).showSnackBar(
- const SnackBar(
- content: Text('Export des membres en cours...'),
- backgroundColor: AppColors.success,
- ),
- );
- }
-
- /// Affiche les détails d'un membre
- void _showMemberDetails(Map member) {
- showModalBottomSheet(
- context: context,
- isScrollControlled: true,
- backgroundColor: Colors.transparent,
- builder: (context) => _buildMemberDetailsSheet(member),
- );
- }
-
- /// Gère les actions sur un membre
- void _handleMemberAction(String action, Map member) {
- switch (action) {
- case 'view':
- _showMemberDetails(member);
- break;
- case 'edit':
- _showEditMemberDialog(member);
- break;
- case 'message':
- _sendMessageToMember(member);
- break;
- case 'delete':
- _showDeleteMemberDialog(member);
- break;
- }
- }
-
- /// Dialog d'édition de membre : ouvre la fiche détail (édition complète à venir)
- void _showEditMemberDialog(Map member) {
- Navigator.of(context).pop(); // ferme le dialog éventuel
- _showMemberDetails(member);
- }
-
- /// Envoie un message à un membre
- void _sendMessageToMember(Map member) {
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(
- content: Text('Message à ${member['name']} à implémenter'),
- backgroundColor: AppColors.info,
- ),
- );
- }
-
- /// Dialog de suppression de membre
- void _showDeleteMemberDialog(Map member) {
- showDialog(
- context: context,
- builder: (context) => AlertDialog(
- title: const Text('Supprimer le membre'),
- content: Text('Êtes-vous sûr de vouloir supprimer ${member['name']} ?'),
- actions: [
- TextButton(
- onPressed: () => Navigator.of(context).pop(),
- child: const Text('Annuler'),
- ),
- ElevatedButton(
- onPressed: () {
- Navigator.of(context).pop();
- ScaffoldMessenger.of(context).showSnackBar(
- SnackBar(
- content: Text('${member['name']} supprimé'),
- backgroundColor: AppColors.error,
- ),
- );
- },
- style: ElevatedButton.styleFrom(backgroundColor: Colors.red),
- child: const Text('Supprimer'),
- ),
- ],
- ),
- );
- }
-
- // ═══════════════════════════════════════════════════════════════════════════
- // WIDGETS SPÉCIALISÉS ET VUES AVANCÉES
- // ═══════════════════════════════════════════════════════════════════════════
-
- /// Carte de membre pour la vue grille
- Widget _buildMemberGridCard(Map member) {
- final contributionScore = member['contributionScore'] as int;
-
- return Container(
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(12),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withOpacity(0.05),
- blurRadius: 10,
- offset: const Offset(0, 2),
- ),
- ],
- ),
- child: InkWell(
- onTap: () => _showMemberDetails(member),
- borderRadius: BorderRadius.circular(12),
- child: Padding(
- padding: const EdgeInsets.all(16),
- child: Column(
- children: [
- // Avatar et statut
- Stack(
- children: [
- CircleAvatar(
- radius: 30,
- backgroundColor: _getStatusColor(member['status']).withOpacity(0.1),
- child: Text(
- member['name'][0].toUpperCase(),
- style: TextStyle(
- color: _getStatusColor(member['status']),
- fontWeight: FontWeight.bold,
- fontSize: 20,
- ),
- ),
- ),
- Positioned(
- bottom: 0,
- right: 0,
- child: Container(
- width: 16,
- height: 16,
- decoration: BoxDecoration(
- color: _getStatusColor(member['status']),
- shape: BoxShape.circle,
- border: Border.all(color: Colors.white, width: 2),
- ),
- ),
- ),
- ],
- ),
- const SizedBox(height: 12),
-
- // Nom et rôle
- Text(
- member['name'],
- style: const TextStyle(
- fontWeight: FontWeight.w600,
- fontSize: 14,
- ),
- textAlign: TextAlign.center,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- ),
- const SizedBox(height: 4),
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
- decoration: BoxDecoration(
- color: _getRoleColor(member['role']).withOpacity(0.1),
- borderRadius: BorderRadius.circular(8),
- ),
- child: Text(
- member['role'],
- style: TextStyle(
- fontSize: 10,
- fontWeight: FontWeight.w500,
- color: _getRoleColor(member['role']),
- ),
- textAlign: TextAlign.center,
- ),
- ),
- const SizedBox(height: 8),
-
- // Score de contribution
- Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Icon(
- Icons.star,
- size: 14,
- color: _getScoreColor(contributionScore),
- ),
- const SizedBox(width: 4),
- Text(
- contributionScore.toString(),
- style: TextStyle(
- fontSize: 12,
- fontWeight: FontWeight.w600,
- color: _getScoreColor(contributionScore),
- ),
- ),
- ],
- ),
- const Spacer(),
-
- // Actions rapides
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceEvenly,
- children: [
- IconButton(
- onPressed: () => _showMemberDetails(member),
- icon: const Icon(Icons.visibility, size: 16),
- tooltip: 'Voir',
- ),
- IconButton(
- onPressed: () => _sendMessageToMember(member),
- icon: const Icon(Icons.message, size: 16),
- tooltip: 'Message',
- ),
- ],
- ),
- ],
- ),
- ),
- ),
- );
- }
-
- /// État vide quand aucun membre ne correspond aux filtres
- Widget _buildEmptyState() {
- return SizedBox(
- height: 400,
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Container(
- padding: const EdgeInsets.all(24),
- decoration: BoxDecoration(
- color: AppColors.primaryGreen.withOpacity(0.1),
- shape: BoxShape.circle,
- ),
- child: const Icon(
- Icons.people_outline,
- size: 48,
- color: AppColors.primaryGreen,
- ),
- ),
- const SizedBox(height: 16),
- const Text(
- 'Aucun membre trouvé',
- style: TextStyle(
- fontSize: 18,
- fontWeight: FontWeight.w600,
- color: AppColors.textPrimaryLight,
- ),
- ),
- const SizedBox(height: 8),
- Text(
- _searchQuery.isNotEmpty
- ? 'Aucun membre ne correspond à votre recherche'
- : 'Aucun membre ne correspond aux filtres sélectionnés',
- style: const TextStyle(
- color: AppColors.textSecondaryLight,
- ),
- textAlign: TextAlign.center,
- ),
- const SizedBox(height: 16),
- ElevatedButton.icon(
- onPressed: () {
- setState(() {
- _searchController.clear();
- _searchQuery = '';
- _selectedFilter = 'Tous';
- _selectedRoles.clear();
- });
- },
- icon: const Icon(Icons.refresh),
- label: const Text('Réinitialiser les filtres'),
- style: ElevatedButton.styleFrom(
- backgroundColor: AppColors.primaryGreen,
- foregroundColor: Colors.white,
- ),
- ),
- ],
- ),
- );
- }
-
- /// Vue des équipes (onglet Équipes)
- Widget _buildTeamsView(List> members) {
- final departments = >>{};
-
- // Grouper par département
- for (final member in members) {
- final dept = member['department'] as String;
- departments[dept] = departments[dept] ?? [];
- departments[dept]!.add(member);
- }
-
- return ListView.builder(
- padding: const EdgeInsets.symmetric(vertical: 8),
- itemCount: departments.length,
- itemBuilder: (context, index) {
- final dept = departments.keys.elementAt(index);
- final deptMembers = departments[dept]!;
-
- return Card(
- margin: const EdgeInsets.only(bottom: 12),
- child: ExpansionTile(
- title: Text(
- dept,
- style: const TextStyle(fontWeight: FontWeight.w600),
- ),
- subtitle: Text('${deptMembers.length} membre(s)'),
- children: deptMembers.map((member) => ListTile(
- leading: CircleAvatar(
- backgroundColor: _getStatusColor(member['status']).withOpacity(0.1),
- child: Text(
- member['name'][0].toUpperCase(),
- style: TextStyle(
- color: _getStatusColor(member['status']),
- fontWeight: FontWeight.bold,
- ),
- ),
- ),
- title: Text(member['name']),
- subtitle: Text(member['role']),
- trailing: Text(
- member['contributionScore'].toString(),
- style: TextStyle(
- fontWeight: FontWeight.bold,
- color: _getScoreColor(member['contributionScore']),
- ),
- ),
- onTap: () => _showMemberDetails(member),
- )).toList(),
- ),
- );
- },
- );
- }
-
- /// Vue analytics (onglet Analytics)
- Widget _buildAnalyticsView(List> members) {
- return SingleChildScrollView(
- padding: const EdgeInsets.symmetric(vertical: 8),
- child: Column(
- children: [
- // Graphique de répartition par statut
- _buildStatusChart(members),
- const SizedBox(height: 16),
-
- // Graphique de répartition par rôle
- _buildRoleChart(members),
- const SizedBox(height: 16),
-
- // Top contributeurs
- _buildTopContributors(members),
- ],
- ),
- );
- }
-
- /// Graphique de répartition par statut
- Widget _buildStatusChart(List> members) {
- final statusCounts = {};
- for (final member in members) {
- final status = member['status'] as String;
- statusCounts[status] = (statusCounts[status] ?? 0) + 1;
- }
-
- return Card(
- child: Padding(
- padding: const EdgeInsets.all(16),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text(
- 'Répartition par Statut',
- style: TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w600,
- ),
- ),
- const SizedBox(height: 12),
- ...statusCounts.entries.map((entry) => Padding(
- padding: const EdgeInsets.only(bottom: 8),
- child: Row(
- children: [
- Container(
- width: 12,
- height: 12,
- decoration: BoxDecoration(
- color: _getStatusColor(entry.key),
- borderRadius: BorderRadius.circular(2),
- ),
- ),
- const SizedBox(width: 8),
- Expanded(child: Text(entry.key)),
- Text(
- entry.value.toString(),
- style: const TextStyle(fontWeight: FontWeight.w600),
- ),
- ],
- ),
- )),
- ],
- ),
- ),
- );
- }
-
- /// Graphique de répartition par rôle
- Widget _buildRoleChart(List> members) {
- final roleCounts = {};
- for (final member in members) {
- final role = member['role'] as String;
- roleCounts[role] = (roleCounts[role] ?? 0) + 1;
- }
-
- return Card(
- child: Padding(
- padding: const EdgeInsets.all(16),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text(
- 'Répartition par Rôle',
- style: TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w600,
- ),
- ),
- const SizedBox(height: 12),
- ...roleCounts.entries.map((entry) => Padding(
- padding: const EdgeInsets.only(bottom: 8),
- child: Row(
- children: [
- Container(
- width: 12,
- height: 12,
- decoration: BoxDecoration(
- color: _getRoleColor(entry.key),
- borderRadius: BorderRadius.circular(2),
- ),
- ),
- const SizedBox(width: 8),
- Expanded(child: Text(entry.key)),
- Text(
- entry.value.toString(),
- style: const TextStyle(fontWeight: FontWeight.w600),
- ),
- ],
- ),
- )),
- ],
- ),
- ),
- );
- }
-
- /// Top contributeurs
- Widget _buildTopContributors(List> members) {
- final sortedMembers = List>.from(members);
- sortedMembers.sort((a, b) => (b['contributionScore'] as int).compareTo(a['contributionScore'] as int));
- final topMembers = sortedMembers.take(5).toList();
-
- return Card(
- child: Padding(
- padding: const EdgeInsets.all(16),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const Text(
- 'Top Contributeurs',
- style: TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w600,
- ),
- ),
- const SizedBox(height: 12),
- ...topMembers.asMap().entries.map((entry) {
- final index = entry.key;
- final member = entry.value;
- return Padding(
- padding: const EdgeInsets.only(bottom: 8),
- child: Row(
- children: [
- Container(
- width: 24,
- height: 24,
- decoration: BoxDecoration(
- color: index < 3 ? AppColors.warning : AppColors.textSecondaryLight,
- borderRadius: BorderRadius.circular(12),
- ),
- child: Center(
- child: Text(
- '${index + 1}',
- style: const TextStyle(
- color: Colors.white,
- fontSize: 12,
- fontWeight: FontWeight.bold,
- ),
- ),
- ),
- ),
- const SizedBox(width: 12),
- CircleAvatar(
- radius: 16,
- backgroundColor: _getStatusColor(member['status']).withOpacity(0.1),
- child: Text(
- member['name'][0].toUpperCase(),
- style: TextStyle(
- color: _getStatusColor(member['status']),
- fontWeight: FontWeight.bold,
- fontSize: 12,
- ),
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- member['name'],
- style: const TextStyle(fontWeight: FontWeight.w500),
- ),
- Text(
- member['role'],
- style: const TextStyle(
- fontSize: 12,
- color: AppColors.textSecondaryLight,
- ),
- ),
- ],
- ),
- ),
- Container(
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
- decoration: BoxDecoration(
- color: _getScoreColor(member['contributionScore']).withOpacity(0.1),
- borderRadius: BorderRadius.circular(8),
- ),
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- Icon(
- Icons.star,
- size: 12,
- color: _getScoreColor(member['contributionScore']),
- ),
- const SizedBox(width: 2),
- Text(
- member['contributionScore'].toString(),
- style: TextStyle(
- fontSize: 12,
- fontWeight: FontWeight.w600,
- color: _getScoreColor(member['contributionScore']),
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- );
- }),
- ],
- ),
- ),
- );
- }
-
- /// Sheet de détails d'un membre
- Widget _buildMemberDetailsSheet(Map member) {
- return DraggableScrollableSheet(
- initialChildSize: 0.7,
- minChildSize: 0.5,
- maxChildSize: 0.95,
- builder: (context, scrollController) {
- return Container(
- decoration: const BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
- ),
- child: Column(
- children: [
- // Handle
- Container(
- margin: const EdgeInsets.symmetric(vertical: 8),
- width: 40,
- height: 4,
- decoration: BoxDecoration(
- color: Colors.grey[300],
- borderRadius: BorderRadius.circular(2),
- ),
- ),
-
- // Header
- Padding(
- padding: const EdgeInsets.all(16),
- child: Row(
- children: [
- CircleAvatar(
- radius: 30,
- backgroundColor: _getStatusColor(member['status']).withOpacity(0.1),
- child: Text(
- member['name'][0].toUpperCase(),
- style: TextStyle(
- color: _getStatusColor(member['status']),
- fontWeight: FontWeight.bold,
- fontSize: 24,
- ),
- ),
- ),
- const SizedBox(width: 16),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- member['name'],
- style: const TextStyle(
- fontSize: 20,
- fontWeight: FontWeight.bold,
- ),
- ),
- Text(
- member['role'],
- style: TextStyle(
- color: _getRoleColor(member['role']),
- fontWeight: FontWeight.w500,
- ),
- ),
- Container(
- margin: const EdgeInsets.only(top: 4),
- padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
- decoration: BoxDecoration(
- color: _getStatusColor(member['status']).withOpacity(0.1),
- borderRadius: BorderRadius.circular(8),
- ),
- child: Text(
- member['status'],
- style: TextStyle(
- fontSize: 12,
- fontWeight: FontWeight.w500,
- color: _getStatusColor(member['status']),
- ),
- ),
- ),
- ],
- ),
- ),
- IconButton(
- onPressed: () => Navigator.of(context).pop(),
- icon: const Icon(Icons.close),
- ),
- ],
- ),
- ),
-
- // Contenu détaillé
- Expanded(
- child: SingleChildScrollView(
- controller: scrollController,
- padding: const EdgeInsets.all(16),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- // Informations de contact
- _buildDetailSection(
- 'Informations de Contact',
- [
- _buildDetailItem(Icons.email, 'Email', member['email']),
- _buildDetailItem(Icons.phone, 'Téléphone', member['phone']),
- _buildDetailItem(Icons.location_on, 'Localisation', member['location']),
- ],
- ),
-
- // Informations professionnelles
- _buildDetailSection(
- 'Informations Professionnelles',
- [
- _buildDetailItem(Icons.business, 'Département', member['department']),
- _buildDetailItem(Icons.admin_panel_settings, 'Permissions', '${member['permissions']} permissions'),
- _buildDetailItem(Icons.calendar_today, 'Date d\'adhésion', _formatDate(member['joinDate'])),
- _buildDetailItem(Icons.access_time, 'Dernière activité', _formatRelativeTime(member['lastActivity'])),
- ],
- ),
-
- // Statistiques d'activité
- _buildDetailSection(
- 'Statistiques d\'Activité',
- [
- _buildDetailItem(Icons.star, 'Score de contribution', '${member['contributionScore']}/100'),
- _buildDetailItem(Icons.event, 'Événements participés', '${member['eventsAttended']} événements'),
- _buildDetailItem(Icons.work, 'Projets impliqués', '${member['projectsInvolved']} projets'),
- ],
- ),
-
- const SizedBox(height: 20),
-
- // Actions
- Row(
- children: [
- Expanded(
- child: ElevatedButton.icon(
- onPressed: () {
- Navigator.of(context).pop();
- _showEditMemberDialog(member);
- },
- icon: const Icon(Icons.edit),
- label: const Text('Modifier'),
- style: ElevatedButton.styleFrom(
- backgroundColor: AppColors.primaryGreen,
- foregroundColor: Colors.white,
- ),
- ),
- ),
- const SizedBox(width: 12),
- Expanded(
- child: OutlinedButton.icon(
- onPressed: () {
- Navigator.of(context).pop();
- _sendMessageToMember(member);
- },
- icon: const Icon(Icons.message),
- label: const Text('Message'),
- ),
- ),
- ],
- ),
- ],
- ),
- ),
- ),
- ],
- ),
- );
- },
- );
- }
-
- /// Section de détails
- Widget _buildDetailSection(String title, List items) {
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- title,
- style: const TextStyle(
- fontSize: 16,
- fontWeight: FontWeight.w600,
- color: AppColors.textPrimaryLight,
- ),
- ),
- const SizedBox(height: 12),
- ...items,
- const SizedBox(height: 20),
- ],
- );
- }
-
- /// Item de détail
- Widget _buildDetailItem(IconData icon, String label, String value) {
- return Padding(
- padding: const EdgeInsets.only(bottom: 12),
- child: Row(
- children: [
- Icon(
- icon,
- size: 20,
- color: AppColors.textSecondaryLight,
- ),
- const SizedBox(width: 12),
- Expanded(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
- label,
- style: const TextStyle(
- fontSize: 12,
- color: AppColors.textSecondaryLight,
- ),
- ),
- Text(
- value,
- style: const TextStyle(
- fontSize: 14,
- fontWeight: FontWeight.w500,
- color: AppColors.textPrimaryLight,
- ),
- ),
- ],
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/lib/features/members/presentation/pages/members_page_connected.dart b/lib/features/members/presentation/pages/members_page_connected.dart
index eff3c6e..629fd8f 100644
--- a/lib/features/members/presentation/pages/members_page_connected.dart
+++ b/lib/features/members/presentation/pages/members_page_connected.dart
@@ -1,8 +1,10 @@
import 'dart:async';
import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
import '../../../../shared/design_system/unionflow_design_v2.dart';
import '../../../../shared/design_system/components/uf_app_bar.dart';
import '../../../../core/constants/app_constants.dart';
+import '../../../../features/organizations/domain/repositories/organization_repository.dart';
/// Annuaire des Membres - Design UnionFlow
class MembersPageWithDataAndPagination extends StatefulWidget {
@@ -14,6 +16,16 @@ class MembersPageWithDataAndPagination extends StatefulWidget {
final VoidCallback onRefresh;
final void Function(String? query)? onSearch;
final VoidCallback? onAddMember;
+ /// null = SUPER_ADMIN (vue globale, affiche l'organisation sur chaque carte)
+ final String? organisationId;
+ /// Callback déclenché quand l'admin active un membre en attente
+ final void Function(String memberId)? onActivateMember;
+ /// Callback déclenché quand l'admin réinitialise le mot de passe d'un membre
+ final void Function(String memberId)? onResetPassword;
+ /// Callback déclenché quand le superadmin affecte un membre à une organisation
+ final void Function(String memberId, String organisationId)? onAffecterOrganisation;
+ /// Callback pour les actions de cycle de vie adhésion (admin org)
+ final void Function(String memberId, String action, String? motif)? onLifecycleAction;
const MembersPageWithDataAndPagination({
super.key,
@@ -25,6 +37,11 @@ class MembersPageWithDataAndPagination extends StatefulWidget {
required this.onRefresh,
this.onSearch,
this.onAddMember,
+ this.organisationId,
+ this.onActivateMember,
+ this.onResetPassword,
+ this.onAffecterOrganisation,
+ this.onLifecycleAction,
});
@override
@@ -37,6 +54,11 @@ class _MembersPageWithDataAndPaginationState extends State> _organisationsPicker = [];
+
+ bool get _isSuperAdmin => widget.organisationId == null;
+
@override
void dispose() {
_searchDebounce?.cancel();
@@ -74,51 +96,55 @@ class _MembersPageWithDataAndPaginationState extends State m['status'] == 'Actif').length;
- final pendingCount = widget.members.where((m) => m['status'] == 'En attente').length;
+ final pageMembers = widget.members;
+ final activeCount = pageMembers.where((m) => m['status'] == 'Actif').length;
+ final pendingCount = pageMembers.where((m) => m['status'] == 'En attente').length;
return Container(
- padding: const EdgeInsets.all(12),
+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
decoration: BoxDecoration(
color: UnionFlowColors.surface,
- border: Border(
- bottom: BorderSide(color: UnionFlowColors.border.withOpacity(0.5), width: 1),
- ),
+ border: Border(bottom: BorderSide(color: UnionFlowColors.border.withOpacity(0.5), width: 1)),
),
child: Row(
children: [
- Expanded(child: _buildStatBadge('Total', widget.totalCount.toString(), UnionFlowColors.unionGreen)),
- const SizedBox(width: 12),
- Expanded(child: _buildStatBadge('Actifs', activeCount.toString(), UnionFlowColors.success)),
- const SizedBox(width: 12),
- Expanded(child: _buildStatBadge('Attente', pendingCount.toString(), UnionFlowColors.warning)),
+ Expanded(child: _buildStatBadge('Total', widget.totalCount.toString(), UnionFlowColors.unionGreen, subtitle: 'global')),
+ const SizedBox(width: 8),
+ Expanded(child: _buildStatBadge('Actifs', activeCount.toString(), UnionFlowColors.success, subtitle: 'cette page')),
+ const SizedBox(width: 8),
+ Expanded(child: _buildStatBadge('Attente', pendingCount.toString(), UnionFlowColors.warning, subtitle: 'cette page')),
],
),
);
}
- Widget _buildStatBadge(String label, String value, Color color) {
+ Widget _buildStatBadge(String label, String value, Color color, {String? subtitle}) {
return Container(
- padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 8),
+ padding: const EdgeInsets.symmetric(vertical: 7, horizontal: 6),
decoration: BoxDecoration(
- color: color.withOpacity(0.1),
+ color: color.withOpacity(0.08),
borderRadius: BorderRadius.circular(8),
- border: Border.all(color: color.withOpacity(0.3), width: 1),
+ border: Border.all(color: color.withOpacity(0.25), width: 1),
),
child: Column(
children: [
- Text(value, style: TextStyle(fontSize: 20, fontWeight: FontWeight.w700, color: color)),
- const SizedBox(height: 2),
+ Text(value, style: TextStyle(fontSize: 18, fontWeight: FontWeight.w800, color: color)),
Text(label, style: TextStyle(fontSize: 10, fontWeight: FontWeight.w600, color: color)),
+ if (subtitle != null)
+ Text(subtitle, style: TextStyle(fontSize: 9, color: color.withOpacity(0.6))),
],
),
);
}
+ // ── Recherche + Filtres ────────────────────────────────────────────────────
+
Widget _buildSearchAndFilters() {
return Container(
- padding: const EdgeInsets.all(12),
+ padding: const EdgeInsets.fromLTRB(12, 10, 12, 10),
decoration: BoxDecoration(
color: UnionFlowColors.surface,
border: Border(bottom: BorderSide(color: UnionFlowColors.border.withOpacity(0.5), width: 1)),
@@ -136,7 +162,7 @@ class _MembersPageWithDataAndPaginationState extends State setState(() => _filterStatus = label),
- child: Container(
- padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+ child: AnimatedContainer(
+ duration: const Duration(milliseconds: 150),
+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
decoration: BoxDecoration(
- color: isSelected ? UnionFlowColors.unionGreen : UnionFlowColors.surface,
- borderRadius: BorderRadius.circular(12),
+ color: isSelected ? UnionFlowColors.unionGreen : Colors.transparent,
+ borderRadius: BorderRadius.circular(20),
border: Border.all(color: isSelected ? UnionFlowColors.unionGreen : UnionFlowColors.border, width: 1),
),
child: Text(
@@ -210,11 +228,14 @@ class _MembersPageWithDataAndPaginationState extends State widget.onRefresh(),
color: UnionFlowColors.unionGreen,
child: ListView.separated(
- padding: const EdgeInsets.all(12),
+ padding: const EdgeInsets.fromLTRB(12, 12, 12, 12),
itemCount: filtered.length,
separatorBuilder: (_, __) => const SizedBox(height: 6),
itemBuilder: (context, index) => _buildMemberCard(filtered[index]),
@@ -233,11 +254,17 @@ class _MembersPageWithDataAndPaginationState extends State member) {
+ final String? orgName = member['organisationNom'] as String?;
+ final String? numero = member['numeroMembre'] as String?;
+ final String status = member['status'] as String? ?? '?';
+
return GestureDetector(
onTap: () => _showMemberDetails(member),
child: Container(
- padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 7),
+ padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10),
decoration: BoxDecoration(
color: UnionFlowColors.surface,
borderRadius: BorderRadius.circular(10),
@@ -245,104 +272,183 @@ class _MembersPageWithDataAndPaginationState extends State (UnionFlowColors.success, Icons.check_circle_outline),
+ 'Inactif' => (UnionFlowColors.error, Icons.cancel_outlined),
+ 'En attente' => (UnionFlowColors.warning, Icons.schedule_outlined),
+ 'Suspendu' => (const Color(0xFF9E9E9E), Icons.block_outlined),
+ _ => (UnionFlowColors.textSecondary, Icons.help_outline),
+ };
return Container(
- padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
+ padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: color.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
border: Border.all(color: color.withOpacity(0.3), width: 1),
),
- child: Text(status ?? '?', style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, color: color)),
- );
- }
-
- Widget _buildEmptyState() {
- return Center(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
children: [
- Container(
- padding: const EdgeInsets.all(16),
- decoration: const BoxDecoration(color: UnionFlowColors.unionGreenPale, shape: BoxShape.circle),
- child: const Icon(Icons.people_outline, size: 40, color: UnionFlowColors.unionGreen),
- ),
- const SizedBox(height: 12),
- const Text(
- 'Aucun membre trouvé',
- style: TextStyle(fontSize: 14, fontWeight: FontWeight.w700, color: UnionFlowColors.textPrimary),
- ),
- const SizedBox(height: 8),
- Text(
- _searchQuery.isEmpty ? 'Changez vos filtres' : 'Essayez une autre recherche',
- style: const TextStyle(fontSize: 13, color: UnionFlowColors.textSecondary),
- ),
+ Icon(icon, size: 11, color: color),
+ const SizedBox(width: 4),
+ Text(status, style: TextStyle(fontSize: 11, fontWeight: FontWeight.w600, color: color)),
],
),
);
}
+ // ── État vide ─────────────────────────────────────────────────────────────
+
+ Widget _buildEmptyState() {
+ final hasActiveFilters = _filterStatus != 'Tous' || _searchQuery.isNotEmpty;
+ return Center(
+ child: Padding(
+ padding: const EdgeInsets.all(32),
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Container(
+ padding: const EdgeInsets.all(18),
+ decoration: const BoxDecoration(color: UnionFlowColors.unionGreenPale, shape: BoxShape.circle),
+ child: Icon(
+ hasActiveFilters ? Icons.filter_list_off : Icons.people_outline,
+ size: 40,
+ color: UnionFlowColors.unionGreen,
+ ),
+ ),
+ const SizedBox(height: 16),
+ Text(
+ hasActiveFilters ? 'Aucun résultat' : 'Aucun membre',
+ style: const TextStyle(fontSize: 15, fontWeight: FontWeight.w700, color: UnionFlowColors.textPrimary),
+ ),
+ const SizedBox(height: 8),
+ Text(
+ hasActiveFilters
+ ? 'Modifiez la recherche ou le filtre de statut'
+ : 'Aucun membre enregistré pour le moment',
+ textAlign: TextAlign.center,
+ style: const TextStyle(fontSize: 13, color: UnionFlowColors.textSecondary),
+ ),
+ if (hasActiveFilters) ...[
+ const SizedBox(height: 16),
+ GestureDetector(
+ onTap: () {
+ setState(() {
+ _filterStatus = 'Tous';
+ _searchQuery = '';
+ _searchController.clear();
+ });
+ widget.onSearch?.call(null);
+ },
+ child: Container(
+ padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+ decoration: BoxDecoration(
+ border: Border.all(color: UnionFlowColors.unionGreen),
+ borderRadius: BorderRadius.circular(20),
+ ),
+ child: const Text('Effacer les filtres', style: TextStyle(fontSize: 13, color: UnionFlowColors.unionGreen, fontWeight: FontWeight.w600)),
+ ),
+ ),
+ ],
+ ],
+ ),
+ ),
+ );
+ }
+
+ // ── Pagination ────────────────────────────────────────────────────────────
+
Widget _buildPagination() {
return Container(
- padding: const EdgeInsets.symmetric(vertical: 12),
+ padding: const EdgeInsets.symmetric(vertical: 10),
decoration: BoxDecoration(
color: UnionFlowColors.surface,
border: Border(top: BorderSide(color: UnionFlowColors.border.withOpacity(0.5), width: 1)),
@@ -354,10 +460,7 @@ class _MembersPageWithDataAndPaginationState extends State