Merge pull request #184 from acterglobal/anisha/users-firebase

Integrated users with firebase.

Author: kumarpalsinh25

lib/constants/firestore_collection_constants.dart

@@ -1,5 +1,6 @@
 class FirestoreCollections {
   static const String sheets = 'sheets';
+  static const String users = 'users';
   static const String lists = 'lists';
   static const String texts = 'texts';
   static const String events = 'events';

lib/constants/firestore_field_constants.dart

@@ -23,4 +23,5 @@ class FirestoreFieldConstants {
   static const String question = 'question';
   static const String answer = 'answer';
   static const String isMultipleChoice = 'isMultipleChoice';
+  static const String name = 'name';
 }

lib/features/auth/models/auth_user_model.dart

@@ -1,7 +1,8 @@
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:zoe/features/users/models/user_model.dart';
+import 'package:zoe/features/users/providers/user_providers.dart';
 import '../../../common/providers/service_providers.dart';
-import '../models/auth_user_model.dart';
 import '../services/auth_service.dart';
 
 part 'auth_providers.g.dart';
@@ -12,7 +13,7 @@ class AuthState extends _$AuthState {
   final Logger _logger = Logger('AuthState');
 
   @override
-  Future<AuthUserModel?> build() async {
+  Future<UserModel?> build() async {
     final authService = ref.watch(authServiceProvider);
     final prefsService = ref.watch(preferencesServiceProvider);
 
@@ -43,7 +44,7 @@ class AuthState extends _$AuthState {
         if (!ref.mounted) return;
 
         state = AsyncValue.data(
-          user == null ? null : AuthUserModel.fromFirebaseUser(user),
+          user == null ? null : UserModel.fromFirebaseUser(user),
         );
       },
       onError: (e, s) {
@@ -59,7 +60,7 @@ class AuthState extends _$AuthState {
     // Return initial state
     return firebaseUser == null
         ? null
-        : AuthUserModel.fromFirebaseUser(firebaseUser);
+        : UserModel.fromFirebaseUser(firebaseUser);
   }
 
   /// Sign up with email and password
@@ -76,7 +77,12 @@ class AuthState extends _$AuthState {
         password: password,
         displayName: name.trim(),
       );
-      // State will be updated by authStateChanges listener
+
+      final firebaseUser = authService.currentUser;
+      if (firebaseUser != null) {
+        final newUser = UserModel.fromFirebaseUser(firebaseUser);
+        await ref.read(userListProvider.notifier).addUser(newUser);
+      }
     } catch (e, st) {
       _logger.severe('Sign up error: $e');
       state = AsyncValue.error(e, st);

lib/features/auth/providers/auth_providers.dart

@@ -9,7 +9,6 @@ import 'package:zoe/constants/firestore_collection_constants.dart';
 import 'package:zoe/constants/firestore_field_constants.dart';
 import 'package:zoe/features/events/models/events_model.dart';
 import 'package:zoe/features/sheet/models/sheet_model.dart';
-import 'package:zoe/features/sheet/providers/sheet_providers.dart';
 import 'package:zoe/features/users/providers/user_providers.dart';
 
 part 'event_providers.g.dart';

lib/features/auth/providers/auth_providers.g.dart

@@ -18,7 +18,6 @@ class WelcomeSectionWidget extends ConsumerWidget {
     return currentUserAsync.when(
       data: (user) {
         final userName = user?.name ?? L10n.of(context).guest;
-        final firstName = userName.split(' ').first;
 
         return Container(
           width: double.infinity,
@@ -43,7 +42,7 @@ class WelcomeSectionWidget extends ConsumerWidget {
             children: [
               Expanded(
                 flex: 3,
-                child: _buildWelcomeTextWidget(context, theme, firstName),
+                child: _buildWelcomeTextWidget(context, theme, userName),
               ),
               const SizedBox(width: 16),
               Expanded(flex: 2, child: WelcomeAnimationWidget()),
@@ -59,7 +58,7 @@ class WelcomeSectionWidget extends ConsumerWidget {
   Widget _buildWelcomeTextWidget(
     BuildContext context,
     ThemeData theme,
-    String firstName,
+    String userName,
   ) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -73,7 +72,9 @@ class WelcomeSectionWidget extends ConsumerWidget {
         ),
         const SizedBox(height: 4),
         Text(
-          firstName,
+          userName,
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
           style: theme.textTheme.headlineLarge?.copyWith(
             color: Colors.white,
             fontWeight: FontWeight.w800,

lib/features/events/providers/event_providers.dart

@@ -39,6 +39,7 @@ void _updateUserAvatar(WidgetRef ref, String userId, String? imagePath) {
       id: currentUser.id,
       name: currentUser.name,
       bio: currentUser.bio,
+      email: currentUser.email,
       avatar: imagePath,
     );
     ref.read(userListProvider.notifier).updateUser(userId, updatedUser);

lib/features/home/widgets/welcome_section/welcome_section_widget.dart

@@ -199,17 +199,3 @@ List<String> listOfUsersBySheetId(Ref ref, String sheetId) {
           ?.users ??
       [];
 }
-
-/// Provider to check if a sheet exists
-@riverpod
-bool sheetExists(Ref ref, String sheetId) {
-  final sheet = ref.watch(sheetProvider(sheetId));
-  return sheet != null;
-}
-
-/// Provider for sheets sorted by title (filtered by membership)
-@riverpod
-List<SheetModel> sortedSheets(Ref ref) {
-  final sheets = ref.watch(sheetListProvider);
-  return [...sheets]..sort((a, b) => a.title.compareTo(b.title));
-}