ElPoyo/EM2_ERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Début refacto en MVVM (Login, drawer OK

Browse Source
This commit is contained in:
PC-PAUL\paulf
2025-03-10 23:40:54 +01:00
parent b6f169e5f7
commit 2b8e7085aa
15 changed files with 509 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
em2rp/lib/views/calendar_page.dart
View File

@ -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',
userProvider: userProvider), // Pass UserProvider to MainDrawer
currentPage: '/calendar'), // 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

191
em2rp/lib/views/login_page.dart
View File

@ -1,5 +1,4 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:em2rp/providers/user_provider.dart';
import 'package:em2rp/view_model/login_view_model.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(
body: LayoutBuilder(
builder: (context, constraints) {
if (constraints.maxWidth > 900) {
return _buildLargeScreenLayout(context);
} else {
return _buildSmallScreenLayout(context);
}
},
return ChangeNotifierProvider(
create: (_) => LoginViewModel(),
child: Scaffold(
body: LayoutBuilder(
builder: (context, constraints) {
return constraints.maxWidth > 900
? _buildLargeScreenLayout(context)
: _buildSmallScreenLayout(context);
},
),
),
);
}
@ -126,10 +33,7 @@ class _LoginPageState extends State<LoginPage> {
Widget _buildLargeScreenLayout(BuildContext context) {
return Row(
children: <Widget>[
Expanded(
flex: 6,
child: const BigLeftImageWidget(),
),
const Expanded(flex: 6, child: BigLeftImageWidget()),
Expanded(
flex: 4,
child: Padding(
@ -152,34 +56,45 @@ class _LoginPageState extends State<LoginPage> {
}
Widget _buildLoginForm(BuildContext context) {
return Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
const LogoWidget(),
const SizedBox(height: 30),
const WelcomeTextWidget(),
const SizedBox(height: 40),
EmailTextFieldWidget(
emailController: _emailController,
highlightEmailField: _highlightEmailField,
),
const SizedBox(height: 20),
PasswordTextFieldWidget(
passwordController: _passwordController,
obscurePassword: _obscurePassword,
highlightPasswordField: _highlightPasswordField,
onTogglePasswordVisibility: _togglePasswordVisibility,
),
ForgotPasswordButtonWidget(onPressed: _forgotPassword),
const SizedBox(height: 30),
LoginButtonWidget(
isLoading: _isLoading,
onPressed: _signInWithEmailAndPassword,
),
const SizedBox(height: 20),
ErrorMessageWidget(errorMessage: _errorMessage),
],
return Consumer<LoginViewModel>(
builder: (context, loginViewModel, child) {
return Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
const LogoWidget(),
const SizedBox(height: 30),
const WelcomeTextWidget(),
const SizedBox(height: 40),
EmailTextFieldWidget(
emailController: loginViewModel.emailController,
highlightEmailField: loginViewModel.highlightEmailField,
),
const SizedBox(height: 20),
PasswordTextFieldWidget(
passwordController: loginViewModel.passwordController,
obscurePassword: loginViewModel.obscurePassword,
highlightPasswordField: loginViewModel.highlightPasswordField,
onTogglePasswordVisibility:
loginViewModel.togglePasswordVisibility,
),
ForgotPasswordButtonWidget(
onPressed: () => showDialog(
context: context,
builder: (BuildContext context) =>
const ForgotPasswordDialogWidget(),
),
),
const SizedBox(height: 30),
LoginButtonWidget(
isLoading: loginViewModel.isLoading,
onPressed: () => loginViewModel.signIn(context),
),
const SizedBox(height: 20),
ErrorMessageWidget(errorMessage: loginViewModel.errorMessage),
],
);
},
);
}
}

12
em2rp/lib/views/my_account_page.dart
View File

@ -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',
userProvider: userProvider,
), // Pass UserProvider to MainDrawer
currentPage: '/my_account'), // Pass UserProvider to MainDrawer
body: SingleChildScrollView(
// Added SingleChildScrollView for better responsiveness
child: Padding(

76
em2rp/lib/views/user_management_page.dart
View File

@ -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:em2rp/providers/user_provider.dart'; // Import UserProvider
import 'package:provider/provider.dart'; // Import Provider
import 'package:provider/provider.dart';
import '../view_model/user_management_view_model.dart';
class UserManagementPage extends StatelessWidget {
const UserManagementPage({super.key});
@override
Widget build(BuildContext context) {
final userProvider =
Provider.of<UserProvider>(context); // Get UserProvider instance
final userViewModel = Provider.of<UserManagementViewModel>(context);
final authProvider = Provider.of<LocalAuthProvider>(context);
if (userProvider.role != 'ADMIN') {
// Get role from UserProvider
if (authProvider.role != 'ADMIN') {
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.',
style: TextStyle(fontSize: 18, 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)),
),
child: Text('Accès non autorisé',
style: TextStyle(color: Colors.red))),
);
}
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),
),
);
}
}

42
em2rp/lib/views/widgets/image/profile_picture.dart
View File

@ -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(
radius); // Afficher un avatar de chargement
return _buildLoadingAvatar(radius);
} else if (snapshot.hasError) {
print("Erreur FutureBuilder ProfilePictureWidget: ${snapshot.error}");
return _buildDefaultAvatar(radius,
defaultImageUrl); // Afficher avatar par défaut en cas d'erreur Firestore
print("Error loading profile: ${snapshot.error}");
return _buildDefaultAvatar(radius, defaultImageUrl);
} else if (snapshot.data != null && snapshot.data!.exists) {
final userData = snapshot.data!;
final profilePhotoUrl = userData['profilePhotoUrl'] as String?;
final userData = snapshot.data!.data() as Map<String, dynamic>?;
final profilePhotoUrl = userData?['profilePhotoUrl'] as String?;
if (profilePhotoUrl != null && profilePhotoUrl.isNotEmpty) {
return CircleAvatar(
radius: radius,
// Utilisation de Image.network directement dans backgroundImage
backgroundImage: Image.network(
profilePhotoUrl,
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
backgroundImage: NetworkImage(profilePhotoUrl),
onBackgroundImageError: (e, stack) {
print("Error loading profile image: $e");
},
);
} 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);
},
);
}

214
em2rp/lib/views/widgets/nav/main_drawer.dart
View File

@ -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(
{super.key, required this.currentPage, required this.userProvider});
const MainDrawer({super.key, required this.currentPage});
@override
Widget build(BuildContext context) {
return Drawer(
child: ListView(
padding: EdgeInsets.zero,
children: <Widget>[
DrawerHeader(
// Header du drawer
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/EM2_NsurB.jpg'),
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,
return Consumer<LocalAuthProvider>(
builder: (context, userProvider, child) {
final hasUser = userProvider.currentUser != null;
return Drawer(
child: ListView(
padding: EdgeInsets.zero,
children: <Widget>[
DrawerHeader(
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('assets/EM2_NsurB.jpg'),
fit: BoxFit.cover,
colorFilter: ColorFilter.mode(
AppColors.noir.withOpacity(0.4),
BlendMode.darken,
),
),
const SizedBox(height: 8),
Text(
'Bonjour, ${userProvider.firstName ?? 'Erreur'}',
style: TextStyle(
color: AppColors.blanc,
fontSize: 18,
fontWeight: FontWeight.bold,
shadows: [
Shadow(
blurRadius: 3.0,
color: AppColors.noir,
offset: Offset(1.0, 1.0),
),
child: Container(
padding: const EdgeInsets.all(16.0),
alignment: Alignment.bottomLeft,
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
children: [
if (hasUser)
ProfilePictureWidget(
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(
// Lien vers la page Calendrier
leading: const Icon(Icons.calendar_today),
title: const Text('Calendrier'),
selected: currentPage == '/calendar',
selectedColor: AppColors.rouge,
onTap: () {
Navigator.pop(context);
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (context) => CalendarPage()),
);
},
),
ExpansionTileTheme(
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(
leading: const Icon(Icons.calendar_today),
title: const Text('Calendrier'),
selected: currentPage == '/calendar',
selectedColor: AppColors.rouge,
onTap: () {
Navigator.pop(context);
Navigator.pushReplacement(
context,
MaterialPageRoute(builder: (context) => CalendarPage()),
);
},
),
ExpansionTileTheme(
data: const ExpansionTileThemeData(
iconColor: AppColors.noir,
collapsedIconColor: AppColors.noir,
),
ListTile(
leading: const Icon(Icons.group),
// Lien vers "Gestion des Utilisateurs"
title: const Text('Gestion des Utilisateurs'),
selected: currentPage ==
'/user_management', // Check if current page is UserManagementPage
selectedColor: AppColors.rouge,
onTap: () {
Navigator.pop(context); // Ferme le drawer
Navigator.pushReplacement(
// Navigue vers UserManagementPage
context,
MaterialPageRoute(
builder: (context) => const UserManagementPage()),
);
},
child: ExpansionTile(
leading: const Icon(Icons.settings),
title: const Text('Paramètres'),
children: <Widget>[
ListTile(
leading: const Icon(Icons.account_circle),
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(
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()),
);
},
),
],
),
],
),
),
],
),
],
),
);
},
);
}
}