Compare commits
No commits in common. "d3813bfcdb3e2d73ea6bd49a2cf2b5cf1afad431" and "584a725fe06480ed85140ff4305638f3f64aad4a" have entirely different histories.
d3813bfcdb
...
584a725fe0
17
em2rp/.vscode/launch.json
vendored
17
em2rp/.vscode/launch.json
vendored
@ -4,22 +4,7 @@
|
|||||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
|
||||||
"name": "Attach to Chrome",
|
|
||||||
"port": 9222,
|
|
||||||
"request": "attach",
|
|
||||||
"type": "chrome",
|
|
||||||
"webRoot": "${workspaceFolder}",
|
|
||||||
"preLaunchTask": "npm: vite",
|
|
||||||
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Launch Chrome",
|
|
||||||
"request": "launch",
|
|
||||||
"type": "chrome",
|
|
||||||
"url": "http://localhost:8080",
|
|
||||||
"webRoot": "${workspaceFolder}"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Launch Edge",
|
"name": "Launch Edge",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
description: This file stores settings for Dart & Flutter DevTools.
|
|
||||||
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
|
|
||||||
extensions:
|
|
@ -1,27 +1,16 @@
|
|||||||
import 'package:em2rp/views/calendar_page.dart';
|
import 'package:em2rp/views/calendar_page.dart';
|
||||||
import 'package:em2rp/views/login_page.dart';
|
import 'package:em2rp/views/login_page.dart';
|
||||||
import 'package:firebase_auth/firebase_auth.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:firebase_core/firebase_core.dart';
|
import 'package:firebase_core/firebase_core.dart';
|
||||||
import 'firebase_options.dart';
|
import 'firebase_options.dart';
|
||||||
import 'utils/colors.dart';
|
import 'utils/colors.dart';
|
||||||
import 'views/my_account_page.dart';
|
|
||||||
import 'views/user_management_page.dart';
|
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
import 'providers/user_provider.dart';
|
|
||||||
|
|
||||||
void main() async {
|
void main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
await Firebase.initializeApp(
|
await Firebase.initializeApp(
|
||||||
options: DefaultFirebaseOptions.currentPlatform,
|
options: DefaultFirebaseOptions.currentPlatform,
|
||||||
);
|
);
|
||||||
runApp(
|
runApp(const MyApp());
|
||||||
ChangeNotifierProvider(
|
|
||||||
// Wrap MyApp with ChangeNotifierProvider
|
|
||||||
create: (context) => UserProvider(), // Create UserProvider instance
|
|
||||||
child: const MyApp(),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class MyApp extends StatelessWidget {
|
class MyApp extends StatelessWidget {
|
||||||
@ -29,52 +18,51 @@ class MyApp extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
print("test");
|
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
title: 'EM2 ERP',
|
title: 'EM2 ERP',
|
||||||
theme: ThemeData(
|
initialRoute: '/',
|
||||||
primarySwatch: Colors.red,
|
routes: {
|
||||||
primaryColor: AppColors.noir,
|
'/': (context) =>
|
||||||
colorScheme:
|
LoginPage(), // Remplacez HomePage par votre page d'accueil
|
||||||
ColorScheme.fromSwatch().copyWith(secondary: AppColors.rouge),
|
'/calendar': (context) =>
|
||||||
textTheme: const TextTheme(
|
CalendarPage(), // Ajoutez cette ligne pour la route /calendar
|
||||||
bodyMedium: TextStyle(color: AppColors.noir),
|
},
|
||||||
|
theme: ThemeData(
|
||||||
|
primarySwatch: Colors.red,
|
||||||
|
primaryColor: AppColors.noir,
|
||||||
|
colorScheme:
|
||||||
|
ColorScheme.fromSwatch().copyWith(secondary: AppColors.rouge),
|
||||||
|
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), // Couleur rouge quand focus
|
||||||
),
|
),
|
||||||
// Personnalisation de l'InputDecorationTheme pour les text fields
|
enabledBorder: OutlineInputBorder(
|
||||||
inputDecorationTheme: InputDecorationTheme(
|
// Bordure par défaut (non focus)
|
||||||
focusedBorder: OutlineInputBorder(
|
borderSide:
|
||||||
// Bordure lorsqu'il est focus
|
BorderSide(color: AppColors.gris), // Couleur grise par défaut
|
||||||
borderSide: BorderSide(
|
|
||||||
color: AppColors.noir), // Couleur rouge quand focus
|
|
||||||
),
|
|
||||||
enabledBorder: OutlineInputBorder(
|
|
||||||
// Bordure par défaut (non focus)
|
|
||||||
borderSide:
|
|
||||||
BorderSide(color: AppColors.gris), // Couleur grise par défaut
|
|
||||||
),
|
|
||||||
labelStyle: TextStyle(color: AppColors.noir), // Couleur du label
|
|
||||||
hintStyle: TextStyle(color: AppColors.gris), // Couleur du hint text
|
|
||||||
// Tu peux personnaliser d'autres propriétés ici :
|
|
||||||
// fillColor, filled, iconColor, prefixStyle, suffixStyle, etc.
|
|
||||||
),
|
),
|
||||||
elevatedButtonTheme: ElevatedButtonThemeData(
|
labelStyle: TextStyle(color: AppColors.noir), // Couleur du label
|
||||||
style: ElevatedButton.styleFrom(
|
hintStyle: TextStyle(color: AppColors.gris), // Couleur du hint text
|
||||||
foregroundColor:
|
// Tu peux personnaliser d'autres propriétés ici :
|
||||||
AppColors.blanc, // Couleur du texte du bouton (ici blanc)
|
// fillColor, filled, iconColor, prefixStyle, suffixStyle, etc.
|
||||||
backgroundColor: AppColors
|
),
|
||||||
.noir, // Couleur de fond du bouton (si tu veux aussi changer le fond)
|
elevatedButtonTheme: ElevatedButtonThemeData(
|
||||||
// Autres styles possibles pour les boutons :
|
style: ElevatedButton.styleFrom(
|
||||||
// textStyle, padding, shape, elevation, etc.
|
foregroundColor:
|
||||||
),
|
AppColors.blanc, // Couleur du texte du bouton (ici blanc)
|
||||||
|
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: {
|
),
|
||||||
'/login': (context) => const LoginPage(),
|
);
|
||||||
'/calendar': (context) => const CalendarPage(),
|
|
||||||
'/my_account': (context) => const MyAccountPage(),
|
|
||||||
'/user_management': (context) => const UserManagementPage(),
|
|
||||||
},
|
|
||||||
// Conditionally set home based on authentication state
|
|
||||||
home: LoginPage());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,52 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
class UserProvider extends ChangeNotifier {
|
|
||||||
String? _uid;
|
|
||||||
String? _firstName;
|
|
||||||
String? _lastName;
|
|
||||||
String? _role;
|
|
||||||
// String? _profilePictureUrl;
|
|
||||||
String? _email;
|
|
||||||
// String? _phoneNumber;
|
|
||||||
|
|
||||||
String? get uid => _uid;
|
|
||||||
String? get firstName => _firstName;
|
|
||||||
String? get lastName => _lastName;
|
|
||||||
String? get role => _role;
|
|
||||||
// String? get profilePhotoUrl => _profilePictureUrl;
|
|
||||||
String? get email => _email;
|
|
||||||
// String? get phoneNumber => _phoneNumber;
|
|
||||||
|
|
||||||
// void setUserData(Map<String, dynamic> userData, String uid) {
|
|
||||||
// _uid = uid;
|
|
||||||
// _firstName = userData['firstName'];
|
|
||||||
// _lastName = userData['lastName'];
|
|
||||||
// _role = userData['role'] ?? 'USER'; // Default role if not provided
|
|
||||||
// // _profilePictureUrl = userData['profilePhotoUrl'];
|
|
||||||
// _email = userData['email'];
|
|
||||||
// // _phoneNumber = userData['phoneNumber'];
|
|
||||||
// notifyListeners(); // Notify listeners that state has changed
|
|
||||||
// }
|
|
||||||
void setUserData(Map<String, dynamic> userData, String uid) {
|
|
||||||
_uid = uid;
|
|
||||||
_firstName = userData['firstName'];
|
|
||||||
_lastName = userData['lastName'];
|
|
||||||
_role = userData['role'] ?? 'USER'; // Default role if not provided
|
|
||||||
_email = userData['email'];
|
|
||||||
|
|
||||||
print("User data set: $_firstName $_lastName ($_email)");
|
|
||||||
|
|
||||||
notifyListeners();
|
|
||||||
}
|
|
||||||
|
|
||||||
void clearUserData() {
|
|
||||||
_uid = null;
|
|
||||||
_firstName = null;
|
|
||||||
_lastName = null;
|
|
||||||
_role = null;
|
|
||||||
// _profilePictureUrl = null;
|
|
||||||
_email = null;
|
|
||||||
// _phoneNumber = null;
|
|
||||||
notifyListeners();
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,34 +1,20 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:em2rp/views/widgets/nav/main_drawer.dart';
|
import 'package:firebase_auth/firebase_auth.dart';
|
||||||
import 'package:provider/provider.dart'; // Import Provider
|
|
||||||
import 'package:em2rp/providers/user_provider.dart'; // Import UserProvider
|
|
||||||
import 'package:em2rp/utils/colors.dart';
|
|
||||||
|
|
||||||
class CalendarPage extends StatelessWidget {
|
class CalendarPage extends StatelessWidget {
|
||||||
const CalendarPage({super.key});
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final userProvider = Provider.of<UserProvider>(context);
|
final User? user = FirebaseAuth.instance.currentUser;
|
||||||
|
final String email = user?.email ?? 'Guest';
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(title: const Text('Calendrier')),
|
appBar: AppBar(
|
||||||
drawer: MainDrawer(
|
title: Text('Calendar Page'),
|
||||||
currentPage: '/calendar',
|
),
|
||||||
userProvider: userProvider), // Pass UserProvider to MainDrawer
|
|
||||||
body: Center(
|
body: Center(
|
||||||
child: Column(
|
child: Text(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
'Hello $email, welcome to EM2RP',
|
||||||
children: [
|
style: TextStyle(fontSize: 20),
|
||||||
const Text('Page Calendrier', style: TextStyle(fontSize: 24)),
|
|
||||||
const SizedBox(height: 20),
|
|
||||||
if (userProvider.role == 'ADMIN') // Get role from UserProvider
|
|
||||||
const Text('Vue Admin du Calendrier',
|
|
||||||
style: TextStyle(fontSize: 18, color: AppColors.rouge))
|
|
||||||
else
|
|
||||||
const Text('Vue Utilisateur du Calendrier',
|
|
||||||
style: TextStyle(fontSize: 18, color: Colors.blueGrey)),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
import 'package:cloud_firestore/cloud_firestore.dart';
|
|
||||||
import 'package:em2rp/providers/user_provider.dart';
|
|
||||||
import 'package:em2rp/views/widgets/auth/mail_textfield.dart';
|
import 'package:em2rp/views/widgets/auth/mail_textfield.dart';
|
||||||
import 'package:em2rp/views/widgets/error_message.dart';
|
import 'package:em2rp/views/widgets/error_message.dart';
|
||||||
import 'package:em2rp/views/widgets/auth/forgot_password_button.dart';
|
import 'package:em2rp/views/widgets/auth/forgot_password_button.dart';
|
||||||
@ -10,8 +8,6 @@ import 'package:em2rp/views/widgets/auth/password_textfield.dart';
|
|||||||
import 'package:em2rp/views/widgets/auth/welcome_text.dart';
|
import 'package:em2rp/views/widgets/auth/welcome_text.dart';
|
||||||
import 'package:firebase_auth/firebase_auth.dart';
|
import 'package:firebase_auth/firebase_auth.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:em2rp/views/widgets/auth/forgot_password_dialog.dart';
|
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
|
|
||||||
class LoginPage extends StatefulWidget {
|
class LoginPage extends StatefulWidget {
|
||||||
const LoginPage({super.key});
|
const LoginPage({super.key});
|
||||||
@ -37,38 +33,19 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _signInWithEmailAndPassword() async {
|
Future<void> _signInWithEmailAndPassword() async {
|
||||||
// Pas de vérification mounted ici, le widget reste monté pendant toute l'opération
|
|
||||||
setState(() {
|
setState(() {
|
||||||
_errorMessage = '';
|
_errorMessage = '';
|
||||||
_isLoading = true;
|
_isLoading = true;
|
||||||
_highlightPasswordField = false;
|
_highlightPasswordField = false;
|
||||||
_highlightEmailField = false;
|
_highlightEmailField = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final UserCredential userCredential =
|
await FirebaseAuth.instance.signInWithEmailAndPassword(
|
||||||
await FirebaseAuth.instance.signInWithEmailAndPassword(
|
|
||||||
email: _emailController.text.trim(),
|
email: _emailController.text.trim(),
|
||||||
password: _passwordController.text,
|
password: _passwordController.text,
|
||||||
);
|
);
|
||||||
final uid = userCredential.user!.uid;
|
Navigator.of(context).pushReplacementNamed('/calendar');
|
||||||
|
print('Connexion réussie!');
|
||||||
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 {
|
|
||||||
setState(() {
|
|
||||||
_errorMessage = "Aucune donnée utilisateur trouvée.";
|
|
||||||
_isLoading = false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} on FirebaseAuthException catch (e) {
|
} on FirebaseAuthException catch (e) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_isLoading = false;
|
_isLoading = false;
|
||||||
@ -76,16 +53,14 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
_errorMessage = "Email ou mot de passe incorrect.";
|
_errorMessage = "Email ou mot de passe incorrect.";
|
||||||
_highlightPasswordField = true;
|
_highlightPasswordField = true;
|
||||||
_highlightEmailField = true;
|
_highlightEmailField = true;
|
||||||
|
} else if (e.code == 'invalid-email') {
|
||||||
|
_errorMessage = "Adresse email invalide.";
|
||||||
|
_highlightEmailField = true;
|
||||||
} else {
|
} else {
|
||||||
_errorMessage = "Erreur de connexion. Veuillez réessayer.";
|
_errorMessage = "Erreur de connexion. Veuillez réessayer.";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (e) {
|
print('Erreur de connexion: ${e.code} - ${e.message}');
|
||||||
setState(() {
|
|
||||||
_errorMessage =
|
|
||||||
"Erreur lors de la récupération des données utilisateur.";
|
|
||||||
_isLoading = false;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,12 +71,8 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _forgotPassword() {
|
void _forgotPassword() {
|
||||||
showDialog(
|
// TODO: Implémenter la logique de mot de passe oublié
|
||||||
context: context,
|
print("Mot de passe oublié cliqué !");
|
||||||
builder: (BuildContext context) {
|
|
||||||
return const ForgotPasswordDialogWidget();
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@ -124,7 +95,8 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Expanded(
|
Expanded(
|
||||||
flex: 6,
|
flex: 6,
|
||||||
child: const ImageSectionWidget(), // Affiche l'image de gauche
|
child:
|
||||||
|
const ImageSectionWidget(), // Utilise le composant ImageSection
|
||||||
),
|
),
|
||||||
Expanded(
|
Expanded(
|
||||||
flex: 4,
|
flex: 4,
|
||||||
@ -152,9 +124,9 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
const LogoWidget(),
|
const LogoWidget(), // Utilise le widget LogoWidget
|
||||||
const SizedBox(height: 30),
|
const SizedBox(height: 30),
|
||||||
const WelcomeTextWidget(),
|
const WelcomeTextWidget(), // Utilise le widget WelcomeTextWidget
|
||||||
const SizedBox(height: 40),
|
const SizedBox(height: 40),
|
||||||
EmailTextFieldWidget(
|
EmailTextFieldWidget(
|
||||||
emailController: _emailController,
|
emailController: _emailController,
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
import 'package:em2rp/providers/user_provider.dart';
|
|
||||||
import 'package:em2rp/views/widgets/nav/main_drawer.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
|
|
||||||
class MyAccountPage extends StatelessWidget {
|
|
||||||
const MyAccountPage({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final userProvider = Provider.of<UserProvider>(context);
|
|
||||||
|
|
||||||
return Scaffold(
|
|
||||||
appBar: AppBar(title: const Text('Mon Compte')),
|
|
||||||
drawer:
|
|
||||||
MainDrawer(currentPage: '/my_account', userProvider: userProvider),
|
|
||||||
body: const Center(
|
|
||||||
child: Text('Page Mon Compte', style: TextStyle(fontSize: 24)),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,39 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
class UserManagementPage extends StatelessWidget {
|
|
||||||
const UserManagementPage({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final userProvider =
|
|
||||||
Provider.of<UserProvider>(context); // Get UserProvider instance
|
|
||||||
|
|
||||||
if (userProvider.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.',
|
|
||||||
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)),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,4 +1,3 @@
|
|||||||
import 'package:em2rp/views/widgets/auth/forgot_password_dialog.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
class ForgotPasswordButtonWidget extends StatelessWidget {
|
class ForgotPasswordButtonWidget extends StatelessWidget {
|
||||||
@ -11,14 +10,7 @@ class ForgotPasswordButtonWidget extends StatelessWidget {
|
|||||||
return Align(
|
return Align(
|
||||||
alignment: Alignment.centerRight,
|
alignment: Alignment.centerRight,
|
||||||
child: TextButton(
|
child: TextButton(
|
||||||
onPressed: () {
|
onPressed: onPressed,
|
||||||
showDialog(
|
|
||||||
context: context,
|
|
||||||
builder: (BuildContext context) {
|
|
||||||
return const ForgotPasswordDialogWidget();
|
|
||||||
},
|
|
||||||
);
|
|
||||||
},
|
|
||||||
child: const Text(
|
child: const Text(
|
||||||
'Mot de passe oublié ?',
|
'Mot de passe oublié ?',
|
||||||
style: TextStyle(color: Colors.grey),
|
style: TextStyle(color: Colors.grey),
|
||||||
|
@ -1,103 +0,0 @@
|
|||||||
import 'package:em2rp/utils/colors.dart';
|
|
||||||
import 'package:firebase_auth/firebase_auth.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
class ForgotPasswordDialogWidget extends StatefulWidget {
|
|
||||||
const ForgotPasswordDialogWidget({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<ForgotPasswordDialogWidget> createState() =>
|
|
||||||
_ForgotPasswordDialogState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _ForgotPasswordDialogState extends State<ForgotPasswordDialogWidget> {
|
|
||||||
final _emailController = TextEditingController();
|
|
||||||
String _errorMessage = '';
|
|
||||||
bool _isLoading = false;
|
|
||||||
bool _emailSent = false;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void dispose() {
|
|
||||||
_emailController.dispose();
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _resetPassword() async {
|
|
||||||
setState(() {
|
|
||||||
_errorMessage = '';
|
|
||||||
_isLoading = true;
|
|
||||||
_emailSent = false;
|
|
||||||
});
|
|
||||||
try {
|
|
||||||
await FirebaseAuth.instance
|
|
||||||
.sendPasswordResetEmail(email: _emailController.text.trim());
|
|
||||||
setState(() {
|
|
||||||
_isLoading = false;
|
|
||||||
_emailSent = true;
|
|
||||||
});
|
|
||||||
} on FirebaseAuthException catch (e) {
|
|
||||||
setState(() {
|
|
||||||
_isLoading = false;
|
|
||||||
_errorMessage = "Erreur : ${e.message}";
|
|
||||||
_emailSent = false;
|
|
||||||
});
|
|
||||||
print(
|
|
||||||
"Erreur de réinitialisation du mot de passe: ${e.code} - ${e.message}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return AlertDialog(
|
|
||||||
title: const Text('Mot de passe oublié ?'),
|
|
||||||
content: SingleChildScrollView(
|
|
||||||
child: ListBody(
|
|
||||||
children: <Widget>[
|
|
||||||
if (_emailSent)
|
|
||||||
const Text(
|
|
||||||
"Un email de réinitialisation a été envoyé à votre adresse.",
|
|
||||||
style: TextStyle(color: Colors.green)),
|
|
||||||
if (!_emailSent) ...[
|
|
||||||
const Text(
|
|
||||||
"Entrez votre adresse email pour recevoir un lien de réinitialisation."),
|
|
||||||
const SizedBox(height: 20),
|
|
||||||
TextField(
|
|
||||||
controller: _emailController,
|
|
||||||
keyboardType: TextInputType.emailAddress,
|
|
||||||
decoration: const InputDecoration(
|
|
||||||
labelText: 'Email',
|
|
||||||
border: OutlineInputBorder(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (_errorMessage.isNotEmpty)
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(top: 10.0),
|
|
||||||
child: Text(_errorMessage,
|
|
||||||
style: const TextStyle(color: Colors.red)),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
actions: <Widget>[
|
|
||||||
TextButton(
|
|
||||||
child: const Text('Terminer'),
|
|
||||||
onPressed: () {
|
|
||||||
Navigator.of(context).pop();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
if (!_emailSent)
|
|
||||||
ElevatedButton(
|
|
||||||
onPressed: _isLoading ? null : _resetPassword,
|
|
||||||
child: _isLoading
|
|
||||||
? const SizedBox(
|
|
||||||
width: 20,
|
|
||||||
height: 20,
|
|
||||||
child: CircularProgressIndicator(color: AppColors.blanc),
|
|
||||||
)
|
|
||||||
: const Text('Envoyer'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,6 +1,6 @@
|
|||||||
// lib/views/widgets/password_text_field_widget.dart
|
|
||||||
import 'package:em2rp/utils/colors.dart';
|
import 'package:em2rp/utils/colors.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:em2rp/utils/colors.dart';
|
||||||
|
|
||||||
class PasswordTextFieldWidget extends StatelessWidget {
|
class PasswordTextFieldWidget extends StatelessWidget {
|
||||||
final TextEditingController passwordController;
|
final TextEditingController passwordController;
|
||||||
|
@ -1,129 +0,0 @@
|
|||||||
import 'package:em2rp/providers/user_provider.dart'; // Import UserProvider
|
|
||||||
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 Provider
|
|
||||||
|
|
||||||
class MainDrawer extends StatelessWidget {
|
|
||||||
final String currentPage;
|
|
||||||
final UserProvider userProvider;
|
|
||||||
|
|
||||||
const MainDrawer(
|
|
||||||
{super.key, required this.currentPage, required this.userProvider});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return Drawer(
|
|
||||||
child: ListView(
|
|
||||||
padding: EdgeInsets.zero,
|
|
||||||
children: <Widget>[
|
|
||||||
DrawerHeader(
|
|
||||||
// Header du drawer amélioré
|
|
||||||
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, // Align text to the left
|
|
||||||
mainAxisAlignment:
|
|
||||||
MainAxisAlignment.end, // Align content to the bottom
|
|
||||||
children: [
|
|
||||||
Image.asset('assets/EM2_NsurB.jpg',
|
|
||||||
height: 50), // Smaller logo in header
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
Text(
|
|
||||||
'Bonjour, ${userProvider.firstName ?? 'Erreur'}', // Display user's first name from provider
|
|
||||||
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_acount',
|
|
||||||
selectedColor: AppColors.rouge,
|
|
||||||
onTap: () {
|
|
||||||
Navigator.pop(context);
|
|
||||||
Navigator.pushReplacement(
|
|
||||||
context,
|
|
||||||
MaterialPageRoute(
|
|
||||||
builder: (context) => const MyAccountPage()),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
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, // Color when selected
|
|
||||||
onTap: () {
|
|
||||||
Navigator.pop(context); // Ferme le drawer
|
|
||||||
Navigator.pushReplacement(
|
|
||||||
// Navigue vers UserManagementPage
|
|
||||||
context,
|
|
||||||
MaterialPageRoute(
|
|
||||||
builder: (context) => const UserManagementPage()),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
// Tu peux ajouter d'autres liens ici si besoin
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
@ -13,7 +13,6 @@ dependencies:
|
|||||||
firebase_auth: ^5.5.1
|
firebase_auth: ^5.5.1
|
||||||
cloud_firestore: ^5.6.5
|
cloud_firestore: ^5.6.5
|
||||||
google_sign_in: ^6.2.2
|
google_sign_in: ^6.2.2
|
||||||
provider: ^6.1.2
|
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user