mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed password and otp bugs

Browse Source
This commit is contained in:
llsajjad
2025-09-17 15:58:49 +03:30
parent 9970d3f296
commit 6a51c3656a
11 changed files with 352 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/forget_password_otp.dart/pages/d_forget_password_otp.dart_page.dart
+52 -18
View File
@@ -7,13 +7,53 @@ import 'package:tm_app/core/utils/size_config.dart';
import '../../../core/constants/assets.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_otp_strings.dart';
import '../../forget_password_create/pages/forgot_password_create_screen.dart';
class DesktopForgotPasswordOtpPage extends StatelessWidget {
class DesktopForgotPasswordOtpPage extends StatefulWidget {
const DesktopForgotPasswordOtpPage({super.key});
@override
State<DesktopForgotPasswordOtpPage> createState() =>
_DesktopForgotPasswordOtpPageState();
}
class _DesktopForgotPasswordOtpPageState
extends State<DesktopForgotPasswordOtpPage> {
late final AuthViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.errorMessageOtp != null) {
AppToast.error(context, viewModel.errorMessageOtp!);
}
if (viewModel.resetToken != null) {
Router.neglect(
context,
() => Navigator.push(
context,
MaterialPageRoute(builder: (_) => const ForgotPasswordCreateScreen()),
),
);
}
}
@override
void dispose() {
viewModel.removeListener(_viewModelListener);
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -26,7 +66,6 @@ class DesktopForgotPasswordOtpPage extends StatelessWidget {
return Center(
child: SizedBox(
width: 364,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
@@ -62,9 +101,6 @@ class DesktopForgotPasswordOtpPage extends StatelessWidget {
controller: viewModel.otpController,
length: 5,
pinAnimationType: PinAnimationType.scale,
onCompleted: (value) {
debugPrint('OTP: $value');
},
defaultPinTheme: PinTheme(
width: 50.0.w(),
height: 50.0.h(),
@@ -80,24 +116,22 @@ class DesktopForgotPasswordOtpPage extends StatelessWidget {
),
),
SizedBox(height: 24.0.h()),
viewModel.isLoading
viewModel.isLoadingOtp
? const BaseButton(
isEnabled: false,
text: ForgotPasswordOtpStrings.resetLink,
onPressed: null,
)
isEnabled: false,
text: ForgotPasswordOtpStrings.resetLink,
onPressed: null,
)
: BaseButton(
isEnabled: viewModel.canSubmitOtpPage,
text: ForgotPasswordOtpStrings.resetLink,
onPressed:
viewModel.canSubmitOtpPage
? () async {
isEnabled: viewModel.canSubmitOtpPage,
text: ForgotPasswordOtpStrings.resetLink,
onPressed: viewModel.canSubmitOtpPage
? () async {
await viewModel.verifyOtp(context);
}
: null,
),
: null,
),
const SizedBox(height: 12.0),
TextButton(
onPressed: () {
context.pop();
lib/views/forget_password_otp.dart/pages/m_forget_password_otp.dart_page.dart
+36 -6
View File
@@ -3,17 +3,51 @@ import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
import 'package:pinput/pinput.dart';
import 'package:provider/provider.dart';
import 'package:tm_app/core/routes/app_routes.dart';
import 'package:tm_app/core/utils/size_config.dart';
import '../../../core/constants/assets.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_otp_strings.dart';
class MobileForgotPasswordOtpPage extends StatelessWidget {
class MobileForgotPasswordOtpPage extends StatefulWidget {
const MobileForgotPasswordOtpPage({super.key});
@override
State<MobileForgotPasswordOtpPage> createState() =>
_MobileForgotPasswordOtpPageState();
}
class _MobileForgotPasswordOtpPageState
extends State<MobileForgotPasswordOtpPage> {
late final AuthViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.errorMessageOtp != null) {
AppToast.error(context, viewModel.errorMessageOtp!);
}
if (viewModel.resetToken != null) {
const ForgotPasswordCreateRouteData().push(context);
}
}
@override
void dispose() {
viewModel.removeListener(_viewModelListener);
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -58,9 +92,6 @@ class MobileForgotPasswordOtpPage extends StatelessWidget {
controller: viewModel.otpController,
length: 5,
pinAnimationType: PinAnimationType.scale,
onCompleted: (value) {
debugPrint('OTP: $value');
},
defaultPinTheme: PinTheme(
width: 50.0.w(),
height: 50.0.h(),
@@ -76,7 +107,7 @@ class MobileForgotPasswordOtpPage extends StatelessWidget {
),
),
SizedBox(height: 24.0.h()),
viewModel.isLoading
viewModel.isLoadingOtp
? const BaseButton(
isEnabled: false,
text: ForgotPasswordOtpStrings.resetLink,
@@ -92,7 +123,6 @@ class MobileForgotPasswordOtpPage extends StatelessWidget {
}
: null,
),
TextButton(
onPressed: () {
context.pop();
lib/views/forget_password_otp.dart/pages/t_forget_password_otp.dart_page.dart
+52 -18
View File
@@ -7,13 +7,53 @@ import 'package:tm_app/core/utils/size_config.dart';
import '../../../core/constants/assets.dart';
import '../../../core/theme/colors.dart';
import '../../../core/utils/app_toast.dart';
import '../../../view_models/auth_view_model.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_otp_strings.dart';
import '../../forget_password_create/pages/forgot_password_create_screen.dart';
class TabletForgotPasswordOtpPage extends StatelessWidget {
class TabletForgotPasswordOtpPage extends StatefulWidget {
const TabletForgotPasswordOtpPage({super.key});
@override
State<TabletForgotPasswordOtpPage> createState() =>
_TabletForgotPasswordOtpPageState();
}
class _TabletForgotPasswordOtpPageState
extends State<TabletForgotPasswordOtpPage> {
late final AuthViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.errorMessageOtp != null) {
AppToast.error(context, viewModel.errorMessageOtp!);
}
if (viewModel.resetToken != null) {
Router.neglect(
context,
() => Navigator.push(
context,
MaterialPageRoute(builder: (_) => const ForgotPasswordCreateScreen()),
),
);
}
}
@override
void dispose() {
viewModel.removeListener(_viewModelListener);
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -26,7 +66,6 @@ class TabletForgotPasswordOtpPage extends StatelessWidget {
return Center(
child: SizedBox(
width: 364,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
@@ -62,9 +101,6 @@ class TabletForgotPasswordOtpPage extends StatelessWidget {
controller: viewModel.otpController,
length: 5,
pinAnimationType: PinAnimationType.scale,
onCompleted: (value) {
debugPrint('OTP: $value');
},
defaultPinTheme: PinTheme(
width: 50.0.w(),
height: 50.0.h(),
@@ -80,24 +116,22 @@ class TabletForgotPasswordOtpPage extends StatelessWidget {
),
),
SizedBox(height: 24.0.h()),
viewModel.isLoading
viewModel.isLoadingOtp
? const BaseButton(
isEnabled: false,
text: ForgotPasswordOtpStrings.resetLink,
onPressed: null,
)
isEnabled: false,
text: ForgotPasswordOtpStrings.resetLink,
onPressed: null,
)
: BaseButton(
isEnabled: viewModel.canSubmitOtpPage,
text: ForgotPasswordOtpStrings.resetLink,
onPressed:
viewModel.canSubmitOtpPage
? () async {
isEnabled: viewModel.canSubmitOtpPage,
text: ForgotPasswordOtpStrings.resetLink,
onPressed: viewModel.canSubmitOtpPage
? () async {
await viewModel.verifyOtp(context);
}
: null,
),
: null,
),
const SizedBox(height: 12.0),
TextButton(
onPressed: () {
context.pop();
lib/views/forgot_password/pages/d_forgot_apssword_page.dart
+46 -24
View File
@@ -12,9 +12,43 @@ import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_strings.dart';
class DesktopForgotPasswordPage extends StatelessWidget {
class DesktopForgotPasswordPage extends StatefulWidget {
const DesktopForgotPasswordPage({super.key});
@override
State<DesktopForgotPasswordPage> createState() =>
_DesktopForgotPasswordPageState();
}
class _DesktopForgotPasswordPageState extends State<DesktopForgotPasswordPage> {
late final AuthViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.successMessage != null) {
AppToast.success(context, viewModel.successMessage!);
const ForgotPasswordOtpRouteData().push(context);
viewModel.clearMessages();
}
if (viewModel.errorMessageForget != null) {
AppToast.error(context, viewModel.errorMessageForget!);
viewModel.clearMessages();
}
}
@override
void dispose() {
viewModel.removeListener(_viewModelListener);
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -22,17 +56,6 @@ class DesktopForgotPasswordPage extends StatelessWidget {
body: Center(
child: Consumer<AuthViewModel>(
builder: (context, viewModel, _) {
if (viewModel.successMessage != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
AppToast.success(context, viewModel.successMessage!);
const ForgotPasswordOtpRouteData().push(context);
});
} else if (viewModel.errorMessage != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
AppToast.error(context, viewModel.errorMessage!);
});
}
return Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
@@ -78,22 +101,21 @@ class DesktopForgotPasswordPage extends StatelessWidget {
isPassword: false,
),
SizedBox(height: 70.0.h()),
viewModel.isLoading
viewModel.isLoadingForgot
? const BaseButton(
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
onPressed: null,
)
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
onPressed: null,
)
: BaseButton(
isEnabled: viewModel.isEmailValid,
text: ForgotPasswordStrings.resetLink,
onPressed:
viewModel.isEmailValid
? () async {
isEnabled: viewModel.isEmailValid,
text: ForgotPasswordStrings.resetLink,
onPressed: viewModel.isEmailValid
? () async {
await viewModel.forgotPassword(context);
}
: null,
),
: null,
),
const SizedBox(height: 12),
TextButton(
onPressed: () {
lib/views/forgot_password/pages/m_forgot_password_page.dart
+46 -24
View File
@@ -12,9 +12,43 @@ import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_strings.dart';
class MobileForgotPasswordPage extends StatelessWidget {
class MobileForgotPasswordPage extends StatefulWidget {
const MobileForgotPasswordPage({super.key});
@override
State<MobileForgotPasswordPage> createState() =>
_MobileForgotPasswordPageState();
}
class _MobileForgotPasswordPageState extends State<MobileForgotPasswordPage> {
late final AuthViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.successMessage != null) {
AppToast.success(context, viewModel.successMessage!);
const ForgotPasswordOtpRouteData().push(context);
viewModel.clearMessages();
}
if (viewModel.errorMessageForget != null) {
AppToast.error(context, viewModel.errorMessageForget!);
viewModel.clearMessages();
}
}
@override
void dispose() {
viewModel.removeListener(_viewModelListener);
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -24,17 +58,6 @@ class MobileForgotPasswordPage extends StatelessWidget {
padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
child: Consumer<AuthViewModel>(
builder: (context, viewModel, _) {
if (viewModel.successMessage != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
AppToast.success(context, viewModel.successMessage!);
const ForgotPasswordOtpRouteData().push(context);
});
} else if (viewModel.errorMessage != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
AppToast.error(context, viewModel.errorMessage!);
});
}
return Column(
mainAxisSize: MainAxisSize.min,
children: [
@@ -73,22 +96,21 @@ class MobileForgotPasswordPage extends StatelessWidget {
isPassword: false,
),
SizedBox(height: 24.0.h()),
viewModel.isLoading
viewModel.isLoadingForgot
? const BaseButton(
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
onPressed: null,
)
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
onPressed: null,
)
: BaseButton(
isEnabled: viewModel.isEmailValid,
text: ForgotPasswordStrings.resetLink,
onPressed:
viewModel.isEmailValid
? () async {
isEnabled: viewModel.isEmailValid,
text: ForgotPasswordStrings.resetLink,
onPressed: viewModel.isEmailValid
? () async {
await viewModel.forgotPassword(context);
}
: null,
),
: null,
),
TextButton(
onPressed: () {
Navigator.pop(context);
lib/views/forgot_password/pages/t_forgot_password_page.dart
+46 -24
View File
@@ -12,25 +12,48 @@ import '../../login/widgets/login_textfield.dart';
import '../../shared/base_button.dart';
import '../strings/forgot_password_strings.dart';
class TabletForgotPasswordPage extends StatelessWidget {
class TabletForgotPasswordPage extends StatefulWidget {
const TabletForgotPasswordPage({super.key});
@override
State<TabletForgotPasswordPage> createState() =>
_TabletForgotPasswordPageState();
}
class _TabletForgotPasswordPageState extends State<TabletForgotPasswordPage> {
late final AuthViewModel viewModel;
@override
void initState() {
super.initState();
viewModel = context.read<AuthViewModel>();
viewModel.addListener(_viewModelListener);
}
void _viewModelListener() {
if (viewModel.successMessage != null) {
AppToast.success(context, viewModel.successMessage!);
const ForgotPasswordOtpRouteData().push(context);
viewModel.clearMessages();
}
if (viewModel.errorMessageForget != null) {
AppToast.error(context, viewModel.errorMessageForget!);
viewModel.clearMessages();
}
}
@override
void dispose() {
viewModel.removeListener(_viewModelListener);
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: Consumer<AuthViewModel>(
builder: (context, viewModel, _) {
if (viewModel.successMessage != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
AppToast.success(context, viewModel.successMessage!);
const ForgotPasswordOtpRouteData().push(context);
});
} else if (viewModel.errorMessage != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
AppToast.error(context, viewModel.errorMessage!);
});
}
return Center(
child: SizedBox(
width: 364,
@@ -72,22 +95,21 @@ class TabletForgotPasswordPage extends StatelessWidget {
isPassword: false,
),
SizedBox(height: 24.0.h()),
viewModel.isLoading
viewModel.isLoadingForgot
? const BaseButton(
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
onPressed: null,
)
isEnabled: false,
text: ForgotPasswordStrings.resetLink,
onPressed: null,
)
: BaseButton(
isEnabled: viewModel.isEmailValid,
text: ForgotPasswordStrings.resetLink,
onPressed:
viewModel.isEmailValid
? () async {
isEnabled: viewModel.isEmailValid,
text: ForgotPasswordStrings.resetLink,
onPressed: viewModel.isEmailValid
? () async {
await viewModel.forgotPassword(context);
}
: null,
),
: null,
),
const SizedBox(height: 12),
TextButton(
onPressed: () {