Implement complete authentication UI and enhance task management features (#29)

hoanghaoz · coderabbitai[bot] · CodeRabbit · web-flow · commit bb72c59be386 · 2026-04-09T15:21:57.000+07:00
* feat(core): add auth layout template, custom textfield and colors

* feat(auth): implement viewmodels for auth flow (MVVM)

* feat(auth): build complete auth UI screens (Login, Register, OTP, Passwords)

* chore(main): set LoginView as initial route

* refactor(auth) : delete .gitkeep

* chore: update dependencies and pubspec.lock

* refactor(auth): optimize registration logic, timezone handling, and form validation

* feat(auth): update UI for login, registration, and forgot password screens

* feat(tasks): update task management UI and statistics screen

* chore: update main entry point and fix widget tests

* chore: ignore devtools_options.yaml

* chore: ignore devtools_options.yaml

* style(login) : rewrite title for login view

* feat(auth): configure android deep link for supabase oauth

* refactor(ui): add social login callbacks to auth layout template

* feat(auth): update oauth methods with redirect url and signout

* feat(auth): implement AuthGate using StreamBuilder for session tracking

* feat(viewmodel): add oauth logic and improve provider lifecycle

* refactor(ui): migrate LoginView to Provider pattern

* chore(main): set AuthGate as initial route and setup provider

* feat: implement full Focus feature set

- Added Pomodoro timer with Start/Reset/Skip logic.
- Integrated local Quick Notes with Pin/Delete functionality.
- Supported image attachments in notes using image_picker.
- Added Focus settings: time duration, vibration, and ringtones.

* fix (auth) : dispose TextEditingControllers to prevent memory leaks

* refactor (alarm ) : create off alarm button  when time out

* fix: apply CodeRabbit auto-fixes

Fixed 3 file(s) based on 4 unresolved review comments.

Co-authored-by: CodeRabbit &lt;noreply@coderabbit.ai&gt;

* fix(timer): prevent division by zero in progress calculation and sanitize negative settings input

* fix(timer): prevent division by zero in progress calculation and sanitize negative settings input

* fix(auth): unblock new-user login and add settings logout

---------

Co-authored-by: coderabbitai[bot] &lt;136622811+coderabbitai[bot]@users.noreply.github.com&gt;
Co-authored-by: CodeRabbit &lt;noreply@coderabbit.ai&gt;
diff --git a/src/lib/features/auth/presentation/view/login_view.dart b/src/lib/features/auth/presentation/view/login_view.dart
@@ -44,6 +44,8 @@ class _LoginViewState extends State<LoginView> {
 
           if (errorMessage == null) {
             ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Đăng nhập thành công!'), backgroundColor: AppColors.success));
+            // If LoginView was pushed on top of AuthGate, pop back to root so MainScreen is visible.
+            Navigator.of(context).popUntil((route) => route.isFirst);
           } else {
             ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(errorMessage), backgroundColor: AppColors.error));
           }
diff --git a/src/lib/features/auth/presentation/view/register_view.dart b/src/lib/features/auth/presentation/view/register_view.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:task_management_app/features/auth/presentation/view/login_view.dart';
 import '../../../../core/theme/app_colors.dart';
 import '../../../../core/theme/auth_layout_template.dart';
 import '../../../../core/theme/custom_text_field.dart';
@@ -31,10 +30,8 @@ class _RegisterViewState extends State<RegisterView> {
 
           if (errorMessage == null) {
             ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Đăng ký thành công!'), backgroundColor: AppColors.success));
-            Navigator.pushReplacement(
-              context,
-              MaterialPageRoute(builder: (context) => const LoginView()),
-            );
+            // Return to the existing LoginView to avoid stacking duplicate login routes.
+            Navigator.pop(context);
           } else {
             ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(errorMessage), backgroundColor: AppColors.error));
           }
diff --git a/src/lib/features/auth/presentation/viewmodels/auth_viewmodels.dart b/src/lib/features/auth/presentation/viewmodels/auth_viewmodels.dart
@@ -44,6 +44,7 @@ class BaseViewModel extends ChangeNotifier {
       'already registered': 'Email này đã được đăng ký!',
       'already exists': 'Email này đã được đăng ký!',
       'invalid login credentials': 'Email hoặc mật khẩu không chính xác!',
+      'email not confirmed': 'Email chưa được xác nhận. Vui lòng kiểm tra hộp thư!',
       'rate limit': 'Bạn thao tác quá nhanh, vui lòng thử lại sau!',
       'over_email_send_rate_limit': 'Bạn thao tác quá nhanh, vui lòng thử lại sau!',
       'token has expired or is invalid': 'Mã OTP không hợp lệ hoặc đã hết hạn!',
diff --git a/src/lib/features/auth/services/auth_helper.dart b/src/lib/features/auth/services/auth_helper.dart
@@ -15,16 +15,21 @@ class AuthHelper {
         password: password,
       );
 
-      if (response.user != null) {
-        final userId = response.user!.id;
-
+      final user = response.user;
+      if (user != null) {
+        final userId = user.id;
+        final userMetadata = user.userMetadata ?? {};
+        final String? username = userMetadata['username']?.toString();
         final timezoneObj = await FlutterTimezone.getLocalTimezone();
         final String currentTimezone = timezoneObj.toString();
 
         final profileData = await supabase
             .from('profile')
-            .update({'timezone': currentTimezone})
-            .eq('id', userId)
+            .upsert({
+              'id': userId,
+              if (username != null && username.isNotEmpty) 'username': username,
+              'timezone': currentTimezone,
+            })
             .select()
             .single();
 
@@ -77,14 +82,26 @@ class AuthHelper {
           }
       );
 
-      if (response.user != null) {
-        final userId = response.user!.id;
+      final user = response.user;
+      if (user != null) {
+        if (response.session == null) {
+          // Email confirmation may be required; skip profile write until login.
+          return UserModel(
+            id: user.id,
+            email: email,
+            username: username,
+            timezone: currentTimezone,
+          );
+        }
 
-        // Step 2: Insert directly into the 'profile' table
         final profileData = await supabase
             .from('profile')
+            .upsert({
+              'id': user.id,
+              'username': username,
+              'timezone': currentTimezone,
+            })
             .select()
-            .eq('id', userId)
             .single();
 
         return UserModel.fromJson(profileData, email);
diff --git a/src/lib/features/main/view/screens/main_screen.dart b/src/lib/features/main/view/screens/main_screen.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:task_management_app/features/statistics/viewmodel/statistics_viewmodel.dart';
 import 'package:task_management_app/features/tasks/view/screens/home_screen.dart';
+import 'settings_screen.dart';
 import '../../../../core/theme/app_colors.dart';
 import '../../../note/view/focus_screen.dart';
 import '../../../note/viewmodel/focus_viewmodel.dart';
@@ -29,7 +30,7 @@ class _MainScreenState extends State<MainScreen> {
         create: (_) => StatisticsViewmodel(),
         child: const StatisticsScreen(),
     ),
-    const Center(child: Text('Màn hình Cài đặt')),
+    const SettingsScreen(),
   ];
 
   @override
diff --git a/src/lib/features/main/view/screens/settings_screen.dart b/src/lib/features/main/view/screens/settings_screen.dart
@@ -0,0 +1,54 @@
+import 'package:flutter/material.dart';
+import '../../../../core/theme/app_colors.dart';
+import '../../../auth/services/auth_helper.dart';
+
+class SettingsScreen extends StatelessWidget {
+  const SettingsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Cai dat'),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(20),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              'Tai khoan',
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 12),
+            SizedBox(
+              width: double.infinity,
+              child: ElevatedButton.icon(
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: AppColors.error,
+                  foregroundColor: AppColors.white,
+                  padding: const EdgeInsets.symmetric(vertical: 14),
+                ),
+                onPressed: () async {
+                  try {
+                    await signOut();
+                  } catch (error) {
+                    if (!context.mounted) {
+                      return;
+                    }
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      SnackBar(content: Text('Dang xuat that bai: $error')),
+                    );
+                  }
+                },
+                icon: const Icon(Icons.logout_rounded),
+                label: const Text('Dang xuat'),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
diff --git a/src/pubspec.lock b/src/pubspec.lock
@@ -601,7 +601,7 @@ packages:
     source: hosted
     version: "0.28.0"
   shared_preferences:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: shared_preferences
       sha256: "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64"

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ class _LoginViewState extends State<LoginView> {`
`44`	`44`
`45`	`45`	`if (errorMessage == null) {`
`46`	`46`	`ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Đăng nhập thành công!'), backgroundColor: AppColors.success));`
	`47`	`+ // If LoginView was pushed on top of AuthGate, pop back to root so MainScreen is visible.`
	`48`	`+ Navigator.of(context).popUntil((route) => route.isFirst);`
`47`	`49`	`} else {`
`48`	`50`	`ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(errorMessage), backgroundColor: AppColors.error));`
`49`	`51`	`}`