Début refacto en MVVM (Login, drawer OK

em2rp/lib/main.dart

@@ -1,4 +1,5 @@
 import 'package:em2rp/utils/auth_guard_widget.dart';
+import 'package:em2rp/view_model/user_management_view_model.dart';
 import 'package:em2rp/views/calendar_page.dart';
 import 'package:em2rp/views/login_page.dart';
 import 'package:firebase_auth/firebase_auth.dart';
@@ -10,6 +11,8 @@ import 'views/my_account_page.dart';
 import 'views/user_management_page.dart';
 import 'package:provider/provider.dart';
 import 'providers/user_provider.dart';
+import 'providers/local_auth_provider.dart'; // Ajout de l'AuthProvider
+import 'services/user_service.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -19,9 +22,25 @@ void main() async {
   await FirebaseAuth.instance.setPersistence(Persistence.LOCAL);
 
   runApp(
-    ChangeNotifierProvider(
+    MultiProvider(
-      // Wrap MyApp with ChangeNotifierProvider
+      providers: [
-      create: (context) => UserProvider(), // Create UserProvider instance
+        // Injection du service UserService
+        Provider<UserService>(create: (_) => UserService()),
+
+        // AuthProvider pour la gestion de l'authentification
+        ChangeNotifierProvider<LocalAuthProvider>(
+            create: (context) => LocalAuthProvider()),
+
+        // UserProvider déjà existant
+        ChangeNotifierProvider<UserProvider>(
+            create: (context) => UserProvider()),
+
+        // Injection des ViewModels en utilisant UserService et AuthProvider
+        ChangeNotifierProvider<UserManagementViewModel>(
+          create: (context) =>
+              UserManagementViewModel(context.read<UserService>()),
+        ),
+      ],
       child: const MyApp(),
     ),
   );
@@ -43,43 +62,27 @@ class MyApp extends StatelessWidget {
         textTheme: const TextTheme(
           bodyMedium: TextStyle(color: AppColors.noir),
         ),
-        // Personnalisation de l'InputDecorationTheme pour les text fields
         inputDecorationTheme: InputDecorationTheme(
           focusedBorder: OutlineInputBorder(
-            // Bordure lorsqu'il est focus
+            borderSide: BorderSide(color: AppColors.noir),
-            borderSide:
-                BorderSide(color: AppColors.noir), // Couleur rouge quand focus
           ),
           enabledBorder: OutlineInputBorder(
-            // Bordure par défaut (non focus)
+            borderSide: BorderSide(color: AppColors.gris),
-            borderSide:
-                BorderSide(color: AppColors.gris), // Couleur grise par défaut
           ),
-          labelStyle: TextStyle(color: AppColors.noir), // Couleur du label
+          labelStyle: TextStyle(color: AppColors.noir),
-          hintStyle: TextStyle(color: AppColors.gris), // Couleur du hint text
+          hintStyle: TextStyle(color: AppColors.gris),
-          // Tu peux personnaliser d'autres propriétés ici :
-          // fillColor, filled, iconColor, prefixStyle, suffixStyle, etc.
         ),
         elevatedButtonTheme: ElevatedButtonThemeData(
           style: ElevatedButton.styleFrom(
-            foregroundColor:
+            foregroundColor: AppColors.blanc,
-                AppColors.blanc, // Couleur du texte du bouton (ici blanc)
+            backgroundColor: AppColors.noir,
-            backgroundColor: AppColors
-                .noir, // Couleur de fond du bouton (si tu veux aussi changer le fond)
-            // Autres styles possibles pour les boutons :
-            // textStyle, padding, shape, elevation, etc.
           ),
         ),
       ),
       routes: {
-        //Pages accessibles à tous
         '/login': (context) => const LoginPage(),
-
-        //Pages réservées aux UTILISATEURS CONNECTÉS
         '/calendar': (context) => const AuthGuard(child: CalendarPage()),
         '/my_account': (context) => const AuthGuard(child: MyAccountPage()),
-
-        //Pages réservées aux ADMIN
         '/user_management': (context) =>
             const AuthGuard(requiredRole: "ADMIN", child: UserManagementPage()),
       },

em2rp/lib/models/user_model.dart

@@ -0,0 +1,44 @@
+class UserModel {
+  final String uid;
+  final String firstName;
+  final String lastName;
+  final String role;
+  final String profilePhotoUrl;
+  final String email;
+  final String phoneNumber;
+
+  UserModel({
+    required this.uid,
+    required this.firstName,
+    required this.lastName,
+    required this.role,
+    required this.profilePhotoUrl,
+    required this.email,
+    required this.phoneNumber,
+  });
+
+  // Convertit une Map (Firestore) en UserModel
+  factory UserModel.fromMap(Map<String, dynamic> data, String uid) {
+    return UserModel(
+      uid: uid,
+      firstName: data['firstName'] ?? '',
+      lastName: data['lastName'] ?? '',
+      role: data['role'] ?? 'USER',
+      profilePhotoUrl: data['profilePhotoUrl'] ?? '',
+      email: data['email'] ?? '',
+      phoneNumber: data['phoneNumber'] ?? '',
+    );
+  }
+
+  // Convertit un UserModel en Map pour Firestore
+  Map<String, dynamic> toMap() {
+    return {
+      'firstName': firstName,
+      'lastName': lastName,
+      'role': role,
+      'profilePhotoUrl': profilePhotoUrl,
+      'email': email,
+      'phoneNumber': phoneNumber,
+    };
+  }
+}

em2rp/lib/providers/local_auth_provider.dart

@@ -0,0 +1,46 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+import 'package:flutter/material.dart';
+import '../models/user_model.dart';
+
+class LocalAuthProvider with ChangeNotifier {
+  UserModel? _currentUser;
+
+  UserModel? get currentUser => _currentUser;
+  String? get role => _currentUser?.role;
+
+  void setUser(UserModel user) {
+    _currentUser = user;
+    notifyListeners();
+  }
+
+  void clearUser() {
+    _currentUser = null;
+    notifyListeners();
+  }
+
+  Future<UserCredential> signInWithEmailAndPassword(
+      String email, String password) async {
+    try {
+      UserCredential userCredential = await FirebaseAuth.instance
+          .signInWithEmailAndPassword(email: email, password: password);
+
+      DocumentSnapshot userDoc = await FirebaseFirestore.instance
+          .collection('users')
+          .doc(userCredential.user!.uid)
+          .get();
+
+      if (userDoc.exists) {
+        setUser(UserModel.fromMap(
+            userDoc.data() as Map<String, dynamic>, userDoc.id));
+      } else {
+        throw FirebaseAuthException(
+            code: 'user-not-found',
+            message: "Aucune donnée utilisateur trouvée.");
+      }
+      return userCredential;
+    } on FirebaseAuthException catch (e) {
+      throw FirebaseAuthException(code: e.code, message: e.message);
+    }
+  }
+}

em2rp/lib/providers/user_provider.dart

@@ -21,7 +21,7 @@ class UserProvider extends ChangeNotifier {
     _uid = uid;
     _firstName = userData['firstName'];
     _lastName = userData['lastName'];
-    _role = userData['role'] ?? 'USER'; // Default role if not provided
+    _role = userData['role'] ?? 'USER';
     if (userData['profilePhotoUrl'] != "") {
       _profilePictureUrl = userData['profilePhotoUrl'];
     }

em2rp/lib/services/user_service.dart

@@ -0,0 +1,44 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+import '../models/user_model.dart';
+
+class UserService {
+  final FirebaseFirestore _firestore = FirebaseFirestore.instance;
+
+  Future<List<UserModel>> fetchUsers() async {
+    try {
+      final snapshot = await _firestore.collection('users').get();
+      return snapshot.docs
+          .map((doc) => UserModel.fromMap(doc.data(), doc.id))
+          .toList();
+    } catch (e) {
+      print("Erreur: $e");
+      return [];
+    }
+  }
+
+  Future<void> updateUser(UserModel user) async {
+    try {
+      await _firestore.collection('users').doc(user.uid).update(user.toMap());
+    } catch (e) {
+      print("Erreur mise à jour: $e");
+    }
+  }
+
+  Future<void> deleteUser(String uid) async {
+    try {
+      await _firestore.collection('users').doc(uid).delete();
+    } catch (e) {
+      print("Erreur suppression: $e");
+    }
+  }
+
+  Future<void> resetPassword(String email) async {
+    try {
+      await FirebaseAuth.instance.sendPasswordResetEmail(email: email);
+      print("Email de réinitialisation envoyé à $email");
+    } catch (e) {
+      print("Erreur reset password: $e");
+    }
+  }
+}

em2rp/lib/utils/auth_guard_widget.dart

@@ -1,3 +1,4 @@
+import 'package:em2rp/providers/local_auth_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:em2rp/providers/user_provider.dart';
@@ -16,17 +17,17 @@ class AuthGuard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final userProvider = Provider.of<UserProvider>(context);
+    final localAuthProvider = Provider.of<LocalAuthProvider>(context);
 
-    // Si l'utilisateur n'est pas connecté (aucun uid ou email)
+    // Si l'utilisateur n'est pas connecté
-    if (userProvider.uid == null || userProvider.email == null) {
+    if (localAuthProvider.currentUser == null) {
       // Retourne la page de connexion.
       // Vous pouvez aussi déclencher une redirection automatique si nécessaire.
       return const LoginPage();
     }
 
     // Si la page requiert un rôle spécifique et que l'utilisateur ne le possède pas
-    if (requiredRole != null && userProvider.role != requiredRole) {
+    if (requiredRole != null && localAuthProvider.role != requiredRole) {
       return Scaffold(
         appBar: AppBar(title: const Text("Accès refusé")),
         body: const Center(

em2rp/lib/utils/constants.dart

@@ -0,0 +1,3 @@
+class Constants {
+  static const List<String> userRoles = ['USER', 'ADMIN'];
+}

em2rp/lib/view_model/login_view_model.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+import '../providers/local_auth_provider.dart';
+import 'package:provider/provider.dart';
+
+class LoginViewModel extends ChangeNotifier {
+  final TextEditingController emailController = TextEditingController();
+  final TextEditingController passwordController = TextEditingController();
+  String errorMessage = '';
+  bool isLoading = false;
+  bool obscurePassword = true;
+  bool highlightPasswordField = false;
+  bool highlightEmailField = false;
+
+  void togglePasswordVisibility() {
+    obscurePassword = !obscurePassword;
+    notifyListeners();
+  }
+
+  Future<void> signIn(BuildContext context) async {
+    final localAuthProvider =
+        Provider.of<LocalAuthProvider>(context, listen: false);
+    isLoading = true;
+    errorMessage = '';
+    highlightPasswordField = false;
+    highlightEmailField = false;
+    notifyListeners();
+
+    try {
+      await localAuthProvider.signInWithEmailAndPassword(
+          emailController.text.trim(), passwordController.text);
+      print('User signed in');
+
+      // Vérifier si le contexte est toujours valide
+      if (context.mounted) {
+        // Utiliser pushReplacementNamed pour une transition propre
+        Navigator.of(context, rootNavigator: true)
+            .pushReplacementNamed('/calendar');
+      }
+    } on FirebaseAuthException catch (e) {
+      isLoading = false;
+      // Gérer les erreurs...
+      notifyListeners();
+    } finally {
+      // S'assurer que isLoading est remis à false même en cas d'erreur inattendue
+      isLoading = false;
+      notifyListeners();
+    }
+  }
+
+  @override
+  void dispose() {
+    emailController.dispose();
+    passwordController.dispose();
+    super.dispose();
+  }
+}

em2rp/lib/view_model/user_management_view_model.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import '../models/user_model.dart';
+import '../services/user_service.dart';
+
+class UserManagementViewModel extends ChangeNotifier {
+  final UserService _userService;
+  List<UserModel> _users = [];
+  bool _isLoading = false;
+
+  List<UserModel> get users => _users;
+  bool get isLoading => _isLoading;
+
+  UserManagementViewModel(this._userService);
+
+  Future<void> fetchUsers() async {
+    _isLoading = true;
+    notifyListeners();
+
+    _users = await _userService.fetchUsers();
+
+    _isLoading = false;
+    notifyListeners();
+  }
+
+  Future<void> updateUser(UserModel user) async {
+    await _userService.updateUser(user);
+    fetchUsers();
+  }
+
+  Future<void> deleteUser(String uid) async {
+    await _userService.deleteUser(uid);
+    fetchUsers();
+  }
+
+  Future<void> resetPassword(String email) async {
+    await _userService.resetPassword(email);
+  }
+}

em2rp/lib/views/calendar_page.dart

@@ -1,3 +1,4 @@
+import 'package:em2rp/providers/local_auth_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:em2rp/views/widgets/nav/main_drawer.dart';
 import 'package:provider/provider.dart'; // Import Provider
@@ -9,20 +10,19 @@ class CalendarPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final userProvider = Provider.of<UserProvider>(context);
+    final localAuthProvider = Provider.of<LocalAuthProvider>(context);
 
     return Scaffold(
       appBar: AppBar(title: const Text('Calendrier')),
       drawer: MainDrawer(
-          currentPage: '/calendar',
+          currentPage: '/calendar'), // Pass UserProvider to MainDrawer
-          userProvider: userProvider), // Pass UserProvider to MainDrawer
       body: Center(
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             const Text('Page Calendrier', style: TextStyle(fontSize: 24)),
             const SizedBox(height: 20),
-            if (userProvider.role == 'ADMIN') // Get role from UserProvider
+            if (localAuthProvider.role == 'ADMIN') // Get role from UserProvider
               const Text('Vue Admin du Calendrier',
                   style: TextStyle(fontSize: 18, color: AppColors.rouge))
             else

em2rp/lib/views/login_page.dart

@@ -1,5 +1,4 @@
-import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:em2rp/view_model/login_view_model.dart';
-import 'package:em2rp/providers/user_provider.dart';
 import 'package:em2rp/views/widgets/auth/mail_textfield.dart';
 import 'package:em2rp/views/widgets/error_message.dart';
 import 'package:em2rp/views/widgets/auth/forgot_password_button.dart';
@@ -8,117 +7,25 @@ import 'package:em2rp/views/widgets/auth/login_button.dart';
 import 'package:em2rp/views/widgets/image/em2_logo_n_sur_b.dart';
 import 'package:em2rp/views/widgets/auth/password_textfield.dart';
 import 'package:em2rp/views/widgets/auth/welcome_text.dart';
-import 'package:firebase_auth/firebase_auth.dart';
-import 'package:flutter/material.dart';
 import 'package:em2rp/views/widgets/auth/forgot_password_dialog.dart';
+import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-class LoginPage extends StatefulWidget {
+class LoginPage extends StatelessWidget {
   const LoginPage({super.key});
 
-  @override
-  State<LoginPage> createState() => _LoginPageState();
-}
-
-class _LoginPageState extends State<LoginPage> {
-  final _emailController = TextEditingController();
-  final _passwordController = TextEditingController();
-  String _errorMessage = '';
-  bool _isLoading = false;
-  bool _obscurePassword = true;
-  bool _highlightPasswordField = false;
-  bool _highlightEmailField = false;
-
-  @override
-  void dispose() {
-    _emailController.dispose();
-    _passwordController.dispose();
-    super.dispose();
-  }
-
-  Future<void> _signInWithEmailAndPassword() async {
-    // Pas de vérification mounted ici, le widget reste monté pendant toute l'opération
-    setState(() {
-      _errorMessage = '';
-      _isLoading = true;
-      _highlightPasswordField = false;
-      _highlightEmailField = false;
-    });
-
-    try {
-      final UserCredential userCredential =
-          await FirebaseAuth.instance.signInWithEmailAndPassword(
-        email: _emailController.text.trim(),
-        password: _passwordController.text,
-      );
-      final uid = userCredential.user!.uid;
-
-      final DocumentSnapshot userDoc =
-          await FirebaseFirestore.instance.collection('users').doc(uid).get();
-
-      if (userDoc.exists) {
-        print("User document found: ${userDoc.data()}");
-        Provider.of<UserProvider>(context, listen: false)
-            .setUserData(userDoc.data() as Map<String, dynamic>, uid);
-
-        // Maintenant que toutes les données sont chargées, naviguer vers CalendarPage.
-        Navigator.of(context).pushReplacementNamed('/calendar');
-      } else {
-        if (!mounted) return;
-        setState(() {
-          _errorMessage = "Aucune donnée utilisateur trouvée.";
-          _isLoading = false;
-        });
-      }
-    } on FirebaseAuthException catch (e) {
-      if (!mounted) return;
-      setState(() {
-        _isLoading = false;
-        if (e.code == 'user-not-found' || e.code == 'wrong-password') {
-          _errorMessage = "Email ou mot de passe incorrect.";
-          _highlightPasswordField = true;
-          _highlightEmailField = true;
-        } else {
-          _errorMessage = "Erreur de connexion. Veuillez réessayer.";
-        }
-      });
-    } catch (e) {
-      if (!mounted) return;
-      setState(() {
-        _errorMessage =
-            "Erreur lors de la récupération des données utilisateur.";
-        _isLoading = false;
-      });
-    }
-  }
-
-  void _togglePasswordVisibility() {
-    if (!mounted) return;
-    setState(() {
-      _obscurePassword = !_obscurePassword;
-    });
-  }
-
-  void _forgotPassword() {
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return const ForgotPasswordDialogWidget();
-      },
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return ChangeNotifierProvider(
-      body: LayoutBuilder(
+      create: (_) => LoginViewModel(),
-        builder: (context, constraints) {
+      child: Scaffold(
-          if (constraints.maxWidth > 900) {
+        body: LayoutBuilder(
-            return _buildLargeScreenLayout(context);
+          builder: (context, constraints) {
-          } else {
+            return constraints.maxWidth > 900
-            return _buildSmallScreenLayout(context);
+                ? _buildLargeScreenLayout(context)
-          }
+                : _buildSmallScreenLayout(context);
-        },
+          },
+        ),
       ),
     );
   }
@@ -126,10 +33,7 @@ class _LoginPageState extends State<LoginPage> {
   Widget _buildLargeScreenLayout(BuildContext context) {
     return Row(
       children: <Widget>[
-        Expanded(
+        const Expanded(flex: 6, child: BigLeftImageWidget()),
-          flex: 6,
-          child: const BigLeftImageWidget(),
-        ),
         Expanded(
           flex: 4,
           child: Padding(
@@ -152,34 +56,45 @@ class _LoginPageState extends State<LoginPage> {
   }
 
   Widget _buildLoginForm(BuildContext context) {
-    return Column(
+    return Consumer<LoginViewModel>(
-      mainAxisAlignment: MainAxisAlignment.center,
+      builder: (context, loginViewModel, child) {
-      crossAxisAlignment: CrossAxisAlignment.stretch,
+        return Column(
-      children: <Widget>[
+          mainAxisAlignment: MainAxisAlignment.center,
-        const LogoWidget(),
+          crossAxisAlignment: CrossAxisAlignment.stretch,
-        const SizedBox(height: 30),
+          children: <Widget>[
-        const WelcomeTextWidget(),
+            const LogoWidget(),
-        const SizedBox(height: 40),
+            const SizedBox(height: 30),
-        EmailTextFieldWidget(
+            const WelcomeTextWidget(),
-          emailController: _emailController,
+            const SizedBox(height: 40),
-          highlightEmailField: _highlightEmailField,
+            EmailTextFieldWidget(
-        ),
+              emailController: loginViewModel.emailController,
-        const SizedBox(height: 20),
+              highlightEmailField: loginViewModel.highlightEmailField,
-        PasswordTextFieldWidget(
+            ),
-          passwordController: _passwordController,
+            const SizedBox(height: 20),
-          obscurePassword: _obscurePassword,
+            PasswordTextFieldWidget(
-          highlightPasswordField: _highlightPasswordField,
+              passwordController: loginViewModel.passwordController,
-          onTogglePasswordVisibility: _togglePasswordVisibility,
+              obscurePassword: loginViewModel.obscurePassword,
-        ),
+              highlightPasswordField: loginViewModel.highlightPasswordField,
-        ForgotPasswordButtonWidget(onPressed: _forgotPassword),
+              onTogglePasswordVisibility:
-        const SizedBox(height: 30),
+                  loginViewModel.togglePasswordVisibility,
-        LoginButtonWidget(
+            ),
-          isLoading: _isLoading,
+            ForgotPasswordButtonWidget(
-          onPressed: _signInWithEmailAndPassword,
+              onPressed: () => showDialog(
-        ),
+                context: context,
-        const SizedBox(height: 20),
+                builder: (BuildContext context) =>
-        ErrorMessageWidget(errorMessage: _errorMessage),
+                    const ForgotPasswordDialogWidget(),
-      ],
+              ),
+            ),
+            const SizedBox(height: 30),
+            LoginButtonWidget(
+              isLoading: loginViewModel.isLoading,
+              onPressed: () => loginViewModel.signIn(context),
+            ),
+            const SizedBox(height: 20),
+            ErrorMessageWidget(errorMessage: loginViewModel.errorMessage),
+          ],
+        );
+      },
     );
   }
 }

em2rp/lib/views/my_account_page.dart

@@ -1,3 +1,4 @@
+import 'package:em2rp/providers/local_auth_provider.dart';
 import 'package:em2rp/providers/user_provider.dart';
 import 'package:em2rp/utils/firebase_storage_manager.dart';
 import 'package:em2rp/views/widgets/image/profile_picture.dart';
@@ -135,16 +136,15 @@ class _MyAccountPageState extends State<MyAccountPage> {
 
   @override
   Widget build(BuildContext context) {
-    final userProvider = Provider.of<UserProvider>(
+    final localAuthProvider = Provider.of<LocalAuthProvider>(
       context,
-    );
+    ); // Get UserProvider instance
 
     return Scaffold(
-      appBar: AppBar(title: const Text('Mon Compte')),
+      appBar:
+          AppBar(title: const Text('Mon Compte')), // More user-friendly title
       drawer: MainDrawer(
-        currentPage: '/my_account',
+          currentPage: '/my_account'), // Pass UserProvider to MainDrawer
-        userProvider: userProvider,
-      ), // Pass UserProvider to MainDrawer
       body: SingleChildScrollView(
         // Added SingleChildScrollView for better responsiveness
         child: Padding(

em2rp/lib/views/user_management_page.dart

@@ -1,39 +1,67 @@
+import 'package:em2rp/providers/local_auth_provider.dart';
 import 'package:flutter/material.dart';
-import 'package:em2rp/views/widgets/nav/main_drawer.dart';
+import 'package:provider/provider.dart';
-import 'package:em2rp/providers/user_provider.dart'; // Import UserProvider
+import '../view_model/user_management_view_model.dart';
-import 'package:provider/provider.dart'; // Import Provider
 
 class UserManagementPage extends StatelessWidget {
   const UserManagementPage({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final userProvider =
+    final userViewModel = Provider.of<UserManagementViewModel>(context);
-        Provider.of<UserProvider>(context); // Get UserProvider instance
+    final authProvider = Provider.of<LocalAuthProvider>(context);
 
-    if (userProvider.role != 'ADMIN') {
+    if (authProvider.role != 'ADMIN') {
-      // Get role from UserProvider
       return Scaffold(
         appBar: AppBar(title: const Text('Gestion des Utilisateurs')),
-        drawer: MainDrawer(
-            currentPage: '/user_management',
-            userProvider: userProvider), // Pass UserProvider to MainDrawer
         body: const Center(
-          child: Text('Accès non autorisé pour les utilisateurs non-Admin.',
+            child: Text('Accès non autorisé',
-              style: TextStyle(fontSize: 18, color: Colors.red)),
+                style: TextStyle(color: Colors.red))),
-        ),
-      );
-    } else {
-      return Scaffold(
-        appBar: AppBar(title: const Text('Gestion des Utilisateurs (Admin)')),
-        drawer: MainDrawer(
-            currentPage: '/user_management',
-            userProvider: userProvider), // Pass UserProvider to MainDrawer
-        body: const Center(
-          child: Text('Page de Gestion des Utilisateurs (Admin)',
-              style: TextStyle(fontSize: 24)),
-        ),
       );
     }
+
+    return Scaffold(
+      appBar: AppBar(title: const Text('Gestion des Utilisateurs')),
+      body: userViewModel.isLoading
+          ? const Center(child: CircularProgressIndicator())
+          : ListView.builder(
+              itemCount: userViewModel.users.length,
+              itemBuilder: (context, index) {
+                final user = userViewModel.users[index];
+                return ListTile(
+                  leading: CircleAvatar(
+                      backgroundImage: NetworkImage(user.profilePhotoUrl)),
+                  title: Text('${user.firstName} ${user.lastName}'),
+                  subtitle: Text(user.email),
+                  trailing: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      IconButton(
+                        icon: const Icon(Icons.edit),
+                        onPressed: () {
+                          // Afficher la pop-up d'édition
+                        },
+                      ),
+                      IconButton(
+                        icon: const Icon(Icons.lock_reset),
+                        onPressed: () =>
+                            userViewModel.resetPassword(user.email),
+                      ),
+                      IconButton(
+                        icon: const Icon(Icons.delete, color: Colors.red),
+                        onPressed: () => userViewModel.deleteUser(user.uid),
+                      ),
+                    ],
+                  ),
+                );
+              },
+            ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () {
+          // Ajouter un utilisateur
+        },
+        child: const Icon(Icons.add),
+      ),
+    );
   }
 }

em2rp/lib/views/widgets/image/profile_picture.dart

@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 
 class ProfilePictureWidget extends StatelessWidget {
-  final String userId;
+  final String? userId; // Modifié pour être nullable
   final double radius;
-  final String? defaultImageUrl; // URL de l'image par défaut (optionnel)
+  final String? defaultImageUrl;
 
   const ProfilePictureWidget({
     super.key,
@@ -15,42 +15,34 @@ class ProfilePictureWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    // Vérifier si userId est null ou vide
+    if (userId == null || userId!.isEmpty) {
+      return _buildDefaultAvatar(radius, defaultImageUrl);
+    }
+
     return FutureBuilder<DocumentSnapshot>(
       future: FirebaseFirestore.instance.collection('users').doc(userId).get(),
       builder: (context, snapshot) {
         if (snapshot.connectionState == ConnectionState.waiting) {
-          return _buildLoadingAvatar(
+          return _buildLoadingAvatar(radius);
-              radius); // Afficher un avatar de chargement
         } else if (snapshot.hasError) {
-          print("Erreur FutureBuilder ProfilePictureWidget: ${snapshot.error}");
+          print("Error loading profile: ${snapshot.error}");
-          return _buildDefaultAvatar(radius,
+          return _buildDefaultAvatar(radius, defaultImageUrl);
-              defaultImageUrl); // Afficher avatar par défaut en cas d'erreur Firestore
         } else if (snapshot.data != null && snapshot.data!.exists) {
-          final userData = snapshot.data!;
+          final userData = snapshot.data!.data() as Map<String, dynamic>?;
-          final profilePhotoUrl = userData['profilePhotoUrl'] as String?;
+          final profilePhotoUrl = userData?['profilePhotoUrl'] as String?;
 
           if (profilePhotoUrl != null && profilePhotoUrl.isNotEmpty) {
             return CircleAvatar(
               radius: radius,
-              // Utilisation de Image.network directement dans backgroundImage
+              backgroundImage: NetworkImage(profilePhotoUrl),
-              backgroundImage: Image.network(
+              onBackgroundImageError: (e, stack) {
-                profilePhotoUrl,
+                print("Error loading profile image: $e");
-                errorBuilder: (context, error, stackTrace) {
+              },
-                  print(
-                      "Erreur de chargement Image.network pour l'URL: $profilePhotoUrl, Erreur: $error");
-                  // En cas d'erreur de chargement de l'image réseau, afficher l'avatar par défaut
-                  return _buildDefaultAvatar(radius, defaultImageUrl);
-                },
-              ).image, // .image pour obtenir un ImageProvider pour backgroundImage
             );
-          } else {
-            return _buildDefaultAvatar(radius,
-                defaultImageUrl); // Pas d'URL dans Firestore, afficher avatar par défaut
           }
-        } else {
-          return _buildDefaultAvatar(radius,
-              defaultImageUrl); // Document utilisateur non trouvé ou n'existe pas
         }
+        return _buildDefaultAvatar(radius, defaultImageUrl);
       },
     );
   }

em2rp/lib/views/widgets/nav/main_drawer.dart

@@ -1,128 +1,136 @@
-import 'package:em2rp/providers/user_provider.dart';
+import 'package:em2rp/providers/local_auth_provider.dart';
 import 'package:em2rp/utils/colors.dart';
 import 'package:em2rp/views/calendar_page.dart';
 import 'package:em2rp/views/my_account_page.dart';
 import 'package:em2rp/views/user_management_page.dart';
 import 'package:flutter/material.dart';
 import 'package:em2rp/views/widgets/image/profile_picture.dart';
+import 'package:provider/provider.dart';
 
 class MainDrawer extends StatelessWidget {
   final String currentPage;
-  final UserProvider userProvider;
 
-  const MainDrawer(
+  const MainDrawer({super.key, required this.currentPage});
-      {super.key, required this.currentPage, required this.userProvider});
 
   @override
   Widget build(BuildContext context) {
-    return Drawer(
+    return Consumer<LocalAuthProvider>(
-      child: ListView(
+      builder: (context, userProvider, child) {
-        padding: EdgeInsets.zero,
+        final hasUser = userProvider.currentUser != null;
-        children: <Widget>[
+
-          DrawerHeader(
+        return Drawer(
-            // Header du drawer
+          child: ListView(
-            decoration: BoxDecoration(
+            padding: EdgeInsets.zero,
-              image: DecorationImage(
+            children: <Widget>[
-                image: AssetImage('assets/EM2_NsurB.jpg'),
+              DrawerHeader(
-                fit: BoxFit.cover,
+                decoration: BoxDecoration(
-                colorFilter: ColorFilter.mode(
+                  image: DecorationImage(
-                  AppColors.noir.withOpacity(0.4),
+                    image: AssetImage('assets/EM2_NsurB.jpg'),
-                  BlendMode.darken,
+                    fit: BoxFit.cover,
-                ),
+                    colorFilter: ColorFilter.mode(
-              ),
+                      AppColors.noir.withOpacity(0.4),
-            ),
+                      BlendMode.darken,
-            child: Container(
+                    ),
-              padding: const EdgeInsets.all(16.0),
-              alignment: Alignment.bottomLeft,
-              child: Column(
-                // Use Column to arrange logo and user name
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.end,
-                children: [
-                  ProfilePictureWidget(
-                    userId: userProvider.uid!,
-                    radius: 30,
                   ),
-                  const SizedBox(height: 8),
+                ),
-                  Text(
+                child: Container(
-                    'Bonjour, ${userProvider.firstName ?? 'Erreur'}',
+                  padding: const EdgeInsets.all(16.0),
-                    style: TextStyle(
+                  alignment: Alignment.bottomLeft,
-                      color: AppColors.blanc,
+                  child: SingleChildScrollView(
-                      fontSize: 18,
+                    child: Column(
-                      fontWeight: FontWeight.bold,
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                      shadows: [
+                      mainAxisAlignment: MainAxisAlignment.end,
-                        Shadow(
+                      children: [
-                          blurRadius: 3.0,
+                        if (hasUser)
-                          color: AppColors.noir,
+                          ProfilePictureWidget(
-                          offset: Offset(1.0, 1.0),
+                            userId: userProvider.currentUser!.uid,
+                            radius: 30,
+                          )
+                        else
+                          CircleAvatar(
+                            radius: 30,
+                            child: Icon(Icons.account_circle, size: 45),
+                          ),
+                        const SizedBox(height: 8),
+                        Text(
+                          hasUser
+                              ? 'Bonjour, ${userProvider.currentUser!.firstName}'
+                              : 'Bonjour, Utilisateur',
+                          style: TextStyle(
+                            color: AppColors.blanc,
+                            fontSize: 18,
+                            fontWeight: FontWeight.bold,
+                            shadows: [
+                              Shadow(
+                                blurRadius: 3.0,
+                                color: AppColors.noir,
+                                offset: Offset(1.0, 1.0),
+                              ),
+                            ],
+                          ),
                         ),
                       ],
                     ),
                   ),
-                ],
+                ),
               ),
-            ),
+              ListTile(
-          ),
+                leading: const Icon(Icons.calendar_today),
-          ListTile(
+                title: const Text('Calendrier'),
-            // Lien vers la page Calendrier
+                selected: currentPage == '/calendar',
-            leading: const Icon(Icons.calendar_today),
+                selectedColor: AppColors.rouge,
-            title: const Text('Calendrier'),
+                onTap: () {
-            selected: currentPage == '/calendar',
+                  Navigator.pop(context);
-            selectedColor: AppColors.rouge,
+                  Navigator.pushReplacement(
-            onTap: () {
+                    context,
-              Navigator.pop(context);
+                    MaterialPageRoute(builder: (context) => CalendarPage()),
-              Navigator.pushReplacement(
+                  );
-                context,
+                },
-                MaterialPageRoute(builder: (context) => CalendarPage()),
+              ),
-              );
+              ExpansionTileTheme(
-            },
+                data: const ExpansionTileThemeData(
-          ),
+                  iconColor: AppColors.noir,
-          ExpansionTileTheme(
+                  collapsedIconColor: AppColors.noir,
-            data: const ExpansionTileThemeData(
-              iconColor: AppColors.noir,
-              collapsedIconColor: AppColors.noir,
-            ),
-            child: ExpansionTile(
-              leading: const Icon(Icons.settings),
-              title: const Text('Paramètres'),
-              children: <Widget>[
-                ListTile(
-                  leading: const Icon(Icons.account_circle),
-                  // Lien vers "Mon Compte"
-                  title: const Text('Mon Compte'),
-                  selected: currentPage == '/my_account',
-                  selectedColor: AppColors.rouge,
-                  onTap: () {
-                    Navigator.pop(context);
-                    Navigator.pushReplacement(
-                      context,
-                      MaterialPageRoute(
-                          builder: (context) => const MyAccountPage()),
-                    );
-                  },
                 ),
-                ListTile(
+                child: ExpansionTile(
-                  leading: const Icon(Icons.group),
+                  leading: const Icon(Icons.settings),
-                  // Lien vers "Gestion des Utilisateurs"
+                  title: const Text('Paramètres'),
-                  title: const Text('Gestion des Utilisateurs'),
+                  children: <Widget>[
-                  selected: currentPage ==
+                    ListTile(
-                      '/user_management', // Check if current page is UserManagementPage
+                      leading: const Icon(Icons.account_circle),
-                  selectedColor: AppColors.rouge,
+                      title: const Text('Mon Compte'),
-                  onTap: () {
+                      selected: currentPage == '/my_account',
-                    Navigator.pop(context); // Ferme le drawer
+                      selectedColor: AppColors.rouge,
-                    Navigator.pushReplacement(
+                      onTap: () {
-                      // Navigue vers UserManagementPage
+                        Navigator.pop(context);
-                      context,
+                        Navigator.pushReplacement(
-                      MaterialPageRoute(
+                          context,
-                          builder: (context) => const UserManagementPage()),
+                          MaterialPageRoute(
-                    );
+                              builder: (context) => const MyAccountPage()),
-                  },
+                        );
+                      },
+                    ),
+                    ListTile(
+                      leading: const Icon(Icons.group),
+                      title: const Text('Gestion des Utilisateurs'),
+                      selected: currentPage == '/user_management',
+                      selectedColor: AppColors.rouge,
+                      onTap: () {
+                        Navigator.pop(context);
+                        Navigator.pushReplacement(
+                          context,
+                          MaterialPageRoute(
+                              builder: (context) => const UserManagementPage()),
+                        );
+                      },
+                    ),
+                  ],
                 ),
-              ],
+              ),
-            ),
+            ],
           ),
-        ],
+        );
-      ),
+      },
     );
   }
 }