bug fix (manage user,profile,login)

lib/config/my_router.dart

@@ -294,6 +294,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:uae_stat/presentation/Screens/auth_verification/registration.dart';
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
 import '../domain/use_cases/preferences_use_case.dart';
@@ -304,6 +305,7 @@ import '../presentation/Screens/auth_verification/otp_verification.dart';
 import '../presentation/Screens/profilepage.dart';
 import '../presentation/routes/auth_routes/login_route.dart';
 import '../presentation/routes/bottom_bar_routes/tab_routes/home_route.dart';
+import '../presentation/routes/drawer_routes/Drawer Items/edit_profile.dart';
 import '../presentation/routes/drawer_routes/Drawer Items/feedback.dart';
 import '../presentation/routes/drawer_routes/Drawer Items/manage_users.dart';
 
@@ -312,12 +314,16 @@ final GoRouter router = GoRouter(
     GoRoute(
       path: '/',
 //builder: (context, state) => LoginRoute(),
-      builder: (context, state) => MyHomePage(),
+      builder: (context, state) => LoginRoute(),
     ),
     GoRoute(
       path: '/myhomepage',
       builder: (context, state) => MyHomePage(),
     ),
+    GoRoute(
+      path: '/register',
+      builder: (context, state) => RegisterScreen(),
+    ),
     GoRoute(
       path: '/mailverification',
       builder: (context, state) => EmailVerificationScreen(
@@ -329,10 +335,11 @@ final GoRouter router = GoRouter(
       ),
     ),
     GoRoute(
-      path: '/changepassword',
+      path: '/changepassword/:userId',
-      builder: (context, state) => Changepassword(
+      builder: (context, state) {
-        userId: '',
+        final userId = state.pathParameters['userId']!;
-      ),
+        return Changepassword(userId: userId);
+      },
     ),
     GoRoute(
       path: '/createNewPw/:userId/:email',
@@ -356,10 +363,11 @@ final GoRouter router = GoRouter(
       builder: (context, state) => FeedbackForm(),
     ),
     GoRoute(
-      path: '/profile',
+      path: '/profile/:userId',
-      builder: (context, state) => ProfileScreen(
+      builder: (context, state) {
-        userId: '',
+        final userId = state.pathParameters['userId']!;
-      ),
+        return ProfileScreen(userId: userId);
+      },
     ),
     // GoRoute(
     //   path: '/manageuser',
@@ -369,10 +377,13 @@ final GoRouter router = GoRouter(
     //     return ManageUserRouter(title: title);
     //   },
     // ),
+    GoRoute(
+      path: '/editProfile',
+      builder: (context, state) => EditProfile(),
+    ),
     GoRoute(
       path: '/manageuser',
       builder: (context, state) => ManageUserRouter(),
     ),
   ],
 );
-

lib/presentation/Screens/auth_verification/changepassword.dart

@@ -58,7 +58,7 @@ class _ResetPasswordScreenState extends State<Changepassword> {
           //print('userDetails ->: $userData');
           if (userData['items'].isNotEmpty) {
             // Email exists; retrieve user ID
-            final userId = userData['items'][0]['id'];
+            // final userId = userData['items'][0]['id'];
 
             // Proceed with OTP request
             final otpResponse = await http.post(
@@ -87,17 +87,15 @@ class _ResetPasswordScreenState extends State<Changepassword> {
               );
 
               // Navigate to the Email Verification screen
-              Navigator.push(
+              context.go(
-                context,
+                '/mailverification',
-                MaterialPageRoute(
+                extra: {
-                  builder: (context) => EmailVerificationScreen(
+                  'email': email,
-                    email: email,
+                  'userId': widget.userId, // Pass user ID to the next screen
-                    userId: widget.userId, // Pass user ID to the next screen
+                  'otp': otp,
-                    otp: otp,
+                  'otpId': otpId,
-                    otpId: otpId,
+                  'sendVerificationCode': sendVerificationCode,
-                    sendVerificationCode: sendVerificationCode,
+                },
-                  ),
-                ),
               );
             } else {
               final error =
@@ -132,6 +130,12 @@ class _ResetPasswordScreenState extends State<Changepassword> {
     }
   }
 
+  @override
+  void initState() {
+    super.initState();
+    print(widget.userId);
+  }
+
   @override
   void dispose() {
     _emailController.dispose();

lib/presentation/Screens/auth_verification/confirm_password.dart

@@ -156,8 +156,8 @@ class _ConfirmPasswordState extends State<ConfirmPassword> {
                           suffixIcon: IconButton(
                             icon: Icon(
                               _obscurePassword
-                                  ? Icons.visibility
+                                  ? Icons.visibility_off
-                                  : Icons.visibility_off,
+                                  : Icons.visibility,
                               color: Colors.blue,
                             ),
                             onPressed: () {
@@ -184,8 +184,8 @@ class _ConfirmPasswordState extends State<ConfirmPassword> {
                           suffixIcon: IconButton(
                             icon: Icon(
                               _obscureConfirmPassword
-                                  ? Icons.visibility
+                                  ? Icons.visibility_off
-                                  : Icons.visibility_off,
+                                  : Icons.visibility,
                               color: Colors.blue,
                             ),
                             onPressed: () {

lib/presentation/Screens/auth_verification/create_new_pw.dart

@@ -38,13 +38,50 @@ class _CreateNewPwState extends State<CreateNewPw> {
   }
 
   String? _validateNewPassword(String? value) {
+    // Define the regular expression for allowed characters
+    final regex = RegExp(
+        r'^[A-Za-z0-9~!@#$%^&*()_+=[\]{}|;:,.<>?/-àèìòùáéíóúÀÈÌÒÙÁÉÍÓÚ]*$');
+
+    // Define regular expressions for password complexity requirements
+    final hasUppercase = RegExp(r'[A-Z]');
+    final hasLowercase = RegExp(r'[a-z]');
+    final hasDigit = RegExp(r'\d');
+    final hasSpecialCharacter = RegExp(r'[~!@#$%^&*()_+=[\]{}|;:,.<>?/-]');
+
     if (value == null || value.isEmpty) {
       return 'New password is required';
-    } else if (value.length < 6) {
+    } else if (value.length < 8 || value.length > 64) {
-      return 'Password must be at least 6 characters';
+      return 'Password must be between 8 and 64 characters';
     } else if (value == _oldPassword) {
       return 'New password must not be the same as the old password';
     }
+
+    // Check the regular expression for allowed characters
+    if (!regex.hasMatch(value)) {
+      return 'Password contains invalid characters';
+    }
+
+    // Track missing constraints
+    List<String> missingConstraints = [];
+
+    if (!hasUppercase.hasMatch(value)) {
+      missingConstraints.add('uppercase letter');
+    }
+    if (!hasLowercase.hasMatch(value)) {
+      missingConstraints.add('lowercase letter');
+    }
+    if (!hasDigit.hasMatch(value)) {
+      missingConstraints.add('numeric digit');
+    }
+    if (!hasSpecialCharacter.hasMatch(value)) {
+      missingConstraints.add('special character');
+    }
+
+    // If there are missing constraints, return a consolidated message
+    if (missingConstraints.isNotEmpty) {
+      return 'At least one ${missingConstraints.join(', ')}';
+    }
+
     _newPassword = value; // Store for validation
     return null;
   }
@@ -184,8 +221,8 @@ class _CreateNewPwState extends State<CreateNewPw> {
                 suffixIcon: IconButton(
                   icon: Icon(
                     _obscureOldPassword
-                        ? Icons.visibility
+                        ? Icons.visibility_off
-                        : Icons.visibility_off,
+                        : Icons.visibility,
                     color: Colors.blue,
                   ),
                   onPressed: () {
@@ -208,8 +245,8 @@ class _CreateNewPwState extends State<CreateNewPw> {
                 suffixIcon: IconButton(
                   icon: Icon(
                     _obscureNewPassword
-                        ? Icons.visibility
+                        ? Icons.visibility_off
-                        : Icons.visibility_off,
+                        : Icons.visibility,
                     color: Colors.blue,
                   ),
                   onPressed: () {
@@ -231,8 +268,8 @@ class _CreateNewPwState extends State<CreateNewPw> {
                 suffixIcon: IconButton(
                   icon: Icon(
                     _obscureConfirmPassword
-                        ? Icons.visibility
+                        ? Icons.visibility_off
-                        : Icons.visibility_off,
+                        : Icons.visibility,
                     color: Colors.blue,
                   ),
                   onPressed: () {

lib/presentation/Screens/auth_verification/registration.dart

@@ -6,6 +6,7 @@ import 'package:pocketbase/pocketbase.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/presentation/Screens/profilepage.dart';
 
+import '../../../infrastructure/services/pocketbase_service.dart';
 import '../../routes/auth_routes/login_route.dart';
 
 class RegisterScreen extends StatefulWidget {
@@ -135,27 +136,77 @@ class _RegisterScreenState extends State<RegisterScreen> {
     return null;
   }
 
+  // String? _validatePassword(String? value) {
+  //   // Define the regular expression for allowed characters
+  //   final regex = RegExp(
+  //       r'^[A-Za-z0-9~!@#$%^&*()_+=[\]{}|;:,.<>?/-àèìòùáéíóúÀÈÌÒÙÁÉÍÓÚ]*$');
+  //
+  //   if (value == null || value.isEmpty) {
+  //     return 'Required';
+  //   } else if (value.length < 8) {
+  //     return 'Password must be at least 8characters';
+  //   }
+  //
+  //   // Check the length constraint
+  //   if (value.length < 8 || value.length > 40) {
+  //     return 'Password must be between 8 and 64 characters';
+  //   }
+  //
+  //   // Check the regular expression
+  //   if (!regex.hasMatch(value)) {
+  //     return 'Password contains invalid characters';
+  //   }
+  //
+  //   _password = value; // Store the password for confirm password validation
+  //   return null;
+  // }
+
   String? _validatePassword(String? value) {
     // Define the regular expression for allowed characters
     final regex = RegExp(
         r'^[A-Za-z0-9~!@#$%^&*()_+=[\]{}|;:,.<>?/-àèìòùáéíóúÀÈÌÒÙÁÉÍÓÚ]*$');
 
+    // Define regular expressions for password complexity requirements
+    final hasUppercase = RegExp(r'[A-Z]');
+    final hasLowercase = RegExp(r'[a-z]');
+    final hasDigit = RegExp(r'\d');
+    final hasSpecialCharacter = RegExp(r'[~!@#$%^&*()_+=[\]{}|;:,.<>?/-]');
+
     if (value == null || value.isEmpty) {
       return 'Required';
-    } else if (value.length < 8) {
-      return 'Password must be at least 8characters';
     }
 
     // Check the length constraint
-    if (value.length < 8 || value.length > 40) {
+    if (value.length < 8 || value.length > 64) {
       return 'Password must be between 8 and 64 characters';
     }
 
-    // Check the regular expression
+    // Check the regular expression for allowed characters
     if (!regex.hasMatch(value)) {
       return 'Password contains invalid characters';
     }
 
+    // Track missing constraints
+    List<String> missingConstraints = [];
+
+    if (!hasUppercase.hasMatch(value)) {
+      missingConstraints.add('uppercase letter');
+    }
+    if (!hasLowercase.hasMatch(value)) {
+      missingConstraints.add('lowercase letter');
+    }
+    if (!hasDigit.hasMatch(value)) {
+      missingConstraints.add('numeric digit');
+    }
+    if (!hasSpecialCharacter.hasMatch(value)) {
+      missingConstraints.add('special character');
+    }
+
+    // If there are missing constraints, return a consolidated message
+    if (missingConstraints.isNotEmpty) {
+      return 'At least one ${missingConstraints.join(', ')}';
+    }
+
     _password = value; // Store the password for confirm password validation
     return null;
   }
@@ -182,6 +233,30 @@ class _RegisterScreenState extends State<RegisterScreen> {
     if (_formKey.currentState?.validate() ?? false) {
       if (isChecked) {
         try {
+          final existingUsers = await pb.collection('users').getList(
+                filter: 'email="${_emailController.text}"',
+              );
+
+          if (existingUsers.items.isNotEmpty) {
+            // Email already exists
+            showDialog(
+              context: context,
+              builder: (context) {
+                return AlertDialog(
+                  title: Text('Email Exists'),
+                  content: Text(
+                      'Email ID already exists. Please use a different email.'),
+                  actions: [
+                    TextButton(
+                      onPressed: () => Navigator.pop(context),
+                      child: Text('OK'),
+                    ),
+                  ],
+                );
+              },
+            );
+            return; // Stop registration process
+          }
           final adminAuth = await pb.admins
               .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
 
@@ -194,6 +269,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
             'password': _passwordController.text,
             'passwordConfirm': _passwordController.text,
             'status': 'Pending',
+            'role': 'user',
           }, headers: {
             'Authorization': adminToken
           });
@@ -207,13 +283,6 @@ class _RegisterScreenState extends State<RegisterScreen> {
               registrationSuccess = true;
               registrationFailed = false; // Show success message on success
             });
-
-            // Navigate to ProfileScreen after successful registration
-            // Navigator.pushReplacement(
-            //   context,
-            //   MaterialPageRoute(
-            //       builder: (context) => ProfileScreen(userId: response.id)),
-            // );
           } else {
             throw Exception('User registration failed: missing user ID');
           }
@@ -275,7 +344,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
                   buildIconContainer(Icons.report, Color(0xFF7DAFBC)),
                   SizedBox(height: 20),
                   Text(
-                    "Your registration is pending for Admin Approval.",
+                    "Your registration is pending for verification",
                     textAlign: TextAlign.center,
                     style: TextStyle(
                         fontSize: 16,
@@ -284,7 +353,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
                   ),
                   SizedBox(height: 10),
                   Text(
-                    "Access will be granted once your account is approved.",
+                    "Kindly verify your mail to proceed further.",
                     textAlign: TextAlign.center,
                     style: TextStyle(
                       fontSize: 14,
@@ -293,14 +362,8 @@ class _RegisterScreenState extends State<RegisterScreen> {
                   ),
                   SizedBox(height: 10),
                   ElevatedButton(
-                    onPressed: () => {
+                    onPressed: () {
-                      Navigator.pushReplacement(
+                      context.go('/');
-                        context,
-                        MaterialPageRoute(builder: (context) => LoginRoute()
-
-                            //ProfileScreen(userId: userID)
-                            ),
-                      ),
                     },
                     child: Text(
                       'Go to Login',
@@ -455,8 +518,8 @@ class _RegisterScreenState extends State<RegisterScreen> {
                               suffixIcon: IconButton(
                                 icon: Icon(
                                   _obscurePassword
-                                      ? Icons.visibility
+                                      ? Icons.visibility_off
-                                      : Icons.visibility_off,
+                                      : Icons.visibility,
                                   color: Colors.blue,
                                 ),
                                 onPressed: () {
@@ -487,8 +550,8 @@ class _RegisterScreenState extends State<RegisterScreen> {
                               suffixIcon: IconButton(
                                 icon: Icon(
                                   _obscureConfirmPassword
-                                      ? Icons.visibility
+                                      ? Icons.visibility_off
-                                      : Icons.visibility_off,
+                                      : Icons.visibility,
                                   color: Colors.blue,
                                 ),
                                 onPressed: () {
@@ -628,12 +691,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
                               child: GestureDetector(
                                 onTap: () {
                                   // Navigate to LoginRoute
-                                  Navigator.push(
+                                  context.go('/');
-                                    context,
-                                    MaterialPageRoute(
-                                        builder: (context) => LoginRoute()),
-                                    // MaterialPageRoute(builder: (context) => LoginRoute(userId: userID)),
-                                  );
                                 },
                                 child: Row(
                                   mainAxisSize: MainAxisSize.min,

lib/presentation/Screens/profilepage.dart

@@ -53,6 +53,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
   final TextEditingController _emailController = TextEditingController();
   // To keep track of the selected date
   DateTime? _selectedDate;
+  String? role;
 
   // Date format for the display
   final DateFormat _dateFormat = DateFormat('yyyy-MM-dd');
@@ -148,6 +149,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
       setState(() {
         _usernameController.text = userDetailsResponse.data['username'] ?? '';
         _emailController.text = userDetailsResponse.data['email'] ?? '';
+        role = userDetailsResponse.data['role'] ?? '';
       });
     } catch (e) {
       print('Error fetching user details: $e');
@@ -271,7 +273,11 @@ class _ProfileScreenState extends State<ProfileScreen> {
           _resetFormFields();
           ScaffoldMessenger.of(context).showSnackBar(
               SnackBar(content: Text("Profile updated successfully!")));
+          if (role == 'admin') {
+            context.go('/manageuser');
+          } else {
             context.go('/myhomepage');
+          }
         } catch (error) {
           ScaffoldMessenger.of(context).showSnackBar(
               SnackBar(content: Text("Failed to update profile: $error")));
@@ -306,7 +312,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
         leading: IconButton(
           icon: Icon(Icons.arrow_back_ios_new, color: Colors.black),
           onPressed: () {
-            context.go('/myhomepage');
+            context.go('/');
           },
         ),
         title: Text(
@@ -315,7 +321,9 @@ class _ProfileScreenState extends State<ProfileScreen> {
         ),
         actions: [
           TextButton(
-            onPressed: () {},
+            onPressed: () {
+              context.go('/');
+            },
             child: Text(
               'Logout',
               style: TextStyle(color: Colors.orange),
@@ -425,8 +433,9 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     }
 
                     //RegExp(r"^[a-zA-Z\s]+$");
-                    final nameRegex =
+                    final nameRegex = RegExp(
-                        RegExp(r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF]+$");
+                        r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF\s]+$");
+
                     if (!nameRegex.hasMatch(value)) {
                       return 'Invalid Characters';
                     }
@@ -698,7 +707,7 @@ class ConfirmationDialog extends StatelessWidget {
               ),
               children: [
                 TextSpan(
-                  text: "name",
+                  text: "Name",
                   style:
                       TextStyle(fontWeight: FontWeight.w700), // Bold for "name"
                 ),
@@ -706,7 +715,7 @@ class ConfirmationDialog extends StatelessWidget {
                   text: " or ",
                 ),
                 TextSpan(
-                  text: "date of birth",
+                  text: "Date of birth",
                   style: TextStyle(
                       fontWeight: FontWeight.w700), // Bold for "date of birth"
                 ),

lib/presentation/components/themed_text_field.dart

@@ -1,4 +1,3 @@
-
 import 'package:external_repos/external_repos.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -38,8 +37,8 @@ class ThemedFormField extends HookWidget {
       onPressed: () => isObscured.value = !isObscured.value,
       icon: Icon(
         isObscured.value
-            ? Icons.visibility_outlined
+            ? Icons.visibility_off_outlined
-            : Icons.visibility_off_outlined,
+            : Icons.visibility_outlined,
         color: const Color(0xff9EA2A9),
       ),
     );

lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart

@@ -262,12 +262,12 @@ class _EditProfileState extends State<EditProfile> {
   }
 
   void showConfirmationDialog(BuildContext context) async {
-    final result = await showDialog<bool>(
+    // final result = await showDialog<bool>(
-      context: context,
+    //   context: context,
-      builder: (context) => const ConfirmationDialog(),
+    //   builder: (context) => const ConfirmationDialog(),
-    );
+    // );
 
-    if (result == true) {
+    // if (result == true) {
     // Validate only the country field
     if (_validateDropdown(_selectedCountry) == null) {
       try {
@@ -327,7 +327,7 @@ class _EditProfileState extends State<EditProfile> {
         showError = true;
       });
     }
-    }
+    // }
   }
 
   void _resetFormFields() {
@@ -462,7 +462,7 @@ class _EditProfileState extends State<EditProfile> {
 
                             //RegExp(r"^[a-zA-Z\s]+$");
                             final nameRegex = RegExp(
-                                r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF]+$");
+                                r"^[a-zA-Z0-9'\-\u0627\u0639~\u00C0-\u00FF\s]+$");
                             if (!nameRegex.hasMatch(value)) {
                               return 'Invalid Characters';
                             }

lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart

@@ -177,6 +177,7 @@ class _ManageUserRouterState extends State<ManageUserRouter> {
                         body: {
                           'status': newStatus, // Update status
                           'verified': newStatus == 'Approved' ? true : false,
+                          'reviewed': true,
                         },
                       );
 

lib/presentation/routes/drawer_routes/custom_drawer_routes.dart

@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:pocketbase/pocketbase.dart';
+import 'package:share_plus/share_plus.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
-class BaseScaffold extends StatelessWidget {
+class BaseScaffold extends StatefulWidget {
   final Widget body;
   final Widget title;
   final List<Widget>? actions;
@@ -12,9 +15,81 @@ class BaseScaffold extends StatelessWidget {
     required this.title,
     this.actions,
   }) : super(key: key);
-  // final Widget body;
+
-  //
+  @override
-  // const BaseScaffold({required this.body});
+  _BaseScaffoldState createState() => _BaseScaffoldState();
+}
+
+class _BaseScaffoldState extends State<BaseScaffold> {
+  final _pb = PocketBase('https://pb.venbait.in');
+  String _avatarUrl = '';
+  dynamic userId;
+  String? userName;
+  String? userEmail;
+  String? userAvatar;
+  String? role;
+
+  @override
+  void initState() {
+    super.initState();
+    _checkUserId();
+  }
+
+  // Method to retrieve userId from SharedPreferences
+  Future<String?> getUserId() async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.getString('userId'); // Retrieve the userId
+  }
+
+  // Method to check if userId exists and update state
+  Future<void> _checkUserId() async {
+    String? fetchedUserId = await getUserId();
+    if (fetchedUserId != null && fetchedUserId.isNotEmpty) {
+      setState(() {
+        userId = fetchedUserId;
+      });
+      //print('NAVUser ID: $userId');
+      _fetchUserData();
+    } else {
+      print('No userId found');
+      // Handle the case where userId is not available
+    }
+  }
+
+  Future<void> _fetchUserData() async {
+    try {
+      final adminAuth = await _pb.admins
+          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      final adminToken = adminAuth.token;
+      //print('adminToken- ${adminToken}');
+      final userDetailsResponse = await _pb.collection('users').getOne(
+        userId!,
+        headers: {
+          'Authorization': 'Bearer $adminToken',
+        },
+      );
+      print('NAVuserDetails: $userDetailsResponse');
+
+      setState(() {
+        userName = userDetailsResponse.data['username'] ?? '';
+        userEmail = userDetailsResponse.data['email'] ?? '';
+        userAvatar = userDetailsResponse.data['avatar'] ?? '';
+        role = userDetailsResponse.data['role'] ?? '';
+        String recordId = userId;
+        String collectionId =
+            userDetailsResponse.data['collectionId'] ?? '_pb_users_auth_';
+
+        if (userAvatar!.isNotEmpty && recordId.isNotEmpty) {
+          _avatarUrl =
+              'https://pb.venbait.in/api/files/$collectionId/$recordId/$userAvatar';
+        } else {
+          _avatarUrl = ''; // Reset to default or empty
+        }
+      });
+    } catch (e) {
+      print('Error fetching user details: $e');
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -22,15 +97,29 @@ class BaseScaffold extends StatelessWidget {
     String currentRoute = GoRouterState.of(context).matchedLocation;
     double myheight = MediaQuery.of(context).size.height;
     double mywidth = MediaQuery.of(context).size.width;
+
     return Scaffold(
-      appBar: AppBar(title: title, actions: [
+      appBar: AppBar(
+        title: widget.title,
+        actions: [
+          // IconButton(
+          //   onPressed: () {
+          //     // Share logic here
+          //     print("Share icon pressed");
+          //     Share.share(
+          //         'Open the app: fcscapp://home\n\n'
+          //             'If you don’t have the app installed, '
+          //             'visit: http://localhost:65493');
+          //   },
+          //   icon: Icon(Icons.share),
+          // ),
           IconButton(onPressed: () {}, icon: Icon(Icons.toggle_off_outlined)),
-      ]),
+        ],
+      ),
       drawer: Drawer(
         child: ListView(
           children: [
             DrawerHeader(
-              //decoration: BoxDecoration(color: Colors.blue),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
@@ -49,17 +138,38 @@ class BaseScaffold extends StatelessWidget {
                       children: [
                         SizedBox(
                           width: mywidth / 8,
-                            child: Image(
+                          height: mywidth / 8,
+                          child: ClipOval(
+                            child: _avatarUrl.isNotEmpty
+                                ? Image(
+                                    image: NetworkImage(_avatarUrl),
+                                    fit: BoxFit.cover,
+                                    width: double.infinity,
+                                    height: double.infinity,
+                                  )
+                                : Image(
                                     image: AssetImage(
-                                    'assets/edit_profile/profile.png'))),
+                                        'assets/edit_profile/profile.png'),
+                                    fit: BoxFit.cover,
+                                    width: double.infinity,
+                                    height: double.infinity,
+                                  ),
+                          ),
+                          //child: Image(image: AssetImage('assets/edit_profile/profile.png'))
+                        ),
                         SizedBox(
                           width: mywidth / 20,
                         ),
                         Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            Text('Mohammad'),
+                            // Text(userId ?? 'Loading user...'), // Display userId here
-                            Text('Mohammad@fcsc.com')
+                            // Text('Mohammad@fcsc.com')
+                            Text(userName ?? 'Loading...'),
+                            Text(
+                              userEmail ?? 'Loading...',
+                              style: TextStyle(fontSize: 12),
+                            ),
                           ],
                         )
                       ],
@@ -68,6 +178,7 @@ class BaseScaffold extends StatelessWidget {
                 ],
               ),
             ),
+            if (role != 'admin')
               ListTile(
                 leading: SizedBox(
                     height: myheight / 15,
@@ -77,12 +188,14 @@ class BaseScaffold extends StatelessWidget {
                 title: Text('Feedback'),
                 onTap: () => context.go('/feedback'),
               ),
+            if (role == 'admin')
               ListTile(
                 leading: SizedBox(
                     height: myheight / 15,
                     width: mywidth / 15,
                     child: Image(
-                      image: AssetImage('assets/icons/drawer/manageuser.png'))),
+                        image:
+                            AssetImage('assets/icons/drawer/manageuser.png'))),
                 title: Text('Manage User'),
                 onTap: () => context.go('/manageuser'),
               ),
@@ -130,14 +243,14 @@ class BaseScaffold extends StatelessWidget {
         unselectedItemColor: Colors.grey,
         showUnselectedLabels: true,
       ),
-      body: body,
+      body: widget.body,
     );
   }
 
-  //Map the current route to the selected index
+  // Map the current route to the selected index
   int _getSelectedIndex(String route) {
     switch (route) {
-      case '/':
+      case '/myhomepage':
         return 0;
       case '/about':
         return 1;
@@ -150,11 +263,11 @@ class BaseScaffold extends StatelessWidget {
     }
   }
 
-  //Handle navigation when an item is tapped
+  // Handle navigation when an item is tapped
   void _onItemTapped(BuildContext context, int index) {
     switch (index) {
       case 0:
-        context.go('/');
+        context.go('/myhomepage');
         break;
       case 1:
         context.go('/about');

lib/presentation/routes/drawer_routes/profile/reset_pw_route.dart

@@ -27,7 +27,7 @@ class ResetPwRoute extends HookConsumerWidget {
         suffixIcon: IconButton(
           onPressed: () => doObscureOld.value = !doObscureOld.value,
           icon: Icon(
-            doObscureOld.value ? Icons.visibility : Icons.visibility_off,
+            doObscureOld.value ? Icons.visibility_off : Icons.visibility,
           ),
         ),
       ),
@@ -51,7 +51,7 @@ class ResetPwRoute extends HookConsumerWidget {
         suffixIcon: IconButton(
           onPressed: () => doObscureNew.value = !doObscureNew.value,
           icon: Icon(
-            doObscureNew.value ? Icons.visibility : Icons.visibility_off,
+            doObscureNew.value ? Icons.visibility_off : Icons.visibility,
           ),
         ),
       ),
@@ -72,7 +72,7 @@ class ResetPwRoute extends HookConsumerWidget {
           onPressed: () =>
               doObscureConfirmNew.value = !doObscureConfirmNew.value,
           icon: Icon(
-            doObscureConfirmNew.value ? Icons.visibility : Icons.visibility_off,
+            doObscureConfirmNew.value ? Icons.visibility_off : Icons.visibility,
           ),
         ),
       ),

pubspec.lock

@@ -1244,6 +1244,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  syncfusion_flutter_charts:
+    dependency: "direct main"
+    description:
+      name: syncfusion_flutter_charts
+      sha256: b2a9f0fd585ef96c081c37697b46d48d3b0f3fe6bddc5011a3542962814fafa8
+      url: "https://pub.dev"
+    source: hosted
+    version: "28.1.33"
+  syncfusion_flutter_core:
+    dependency: transitive
+    description:
+      name: syncfusion_flutter_core
+      sha256: b1071c698b502e7d55f91352a8b82d42f49f4c96e523d43b6fade5d5af710048
+      url: "https://pub.dev"
+    source: hosted
+    version: "28.1.33"
   term_glyph:
     dependency: transitive
     description:

pubspec.yaml

@@ -54,6 +54,7 @@ dependencies:
   provider: ^6.1.2
   mailer: ^6.2.0
   image_picker: ^1.1.2
+  syncfusion_flutter_charts: ^28.1.33
 
 dependency_overrides:
   fading_edge_scrollview: ^4.1.1