Jahongir/food_delivery_mobile
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: auth done

Browse Source
This commit is contained in:
jahongireshonqulov
2025-10-30 14:41:55 +05:00
parent f47e78a9a2
commit ab1ac6e6fa
26 changed files with 1702 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/feature/auth/presentation/pages/login_page/widgets/login_body.dart
View File

@@ -2,6 +2,7 @@ import 'package:food_delivery_client/core/helpers/formatters.dart';
import 'package:food_delivery_client/core/helpers/validator_helpers.dart';
import 'package:food_delivery_client/feature/auth/presentation/widgets/w_auth_background.dart';
import '../../../../../../food_delivery_client.dart';
import '../../../../domain/usecases/login_usecase.dart';
import '../../../blocs/login_bloc/login_bloc.dart';
class WLoginBody extends StatefulWidget {
@@ -128,16 +129,15 @@ class _WLoginBodyState extends State<WLoginBody> {
).paddingOnly(left: 10),
onPressed: () {
if (_formKey.currentState?.validate() ?? false) {
context.go(Routes.main);
// context.read<LoginBloc>().add(
// LoginEvent.login(
// LoginParams(
// phoneNumber:
// "+998${_phoneController.text.trim().replaceAll(" ", "")}",
// password: _passwordController.text.trim(),
// ),
// ),
// );
context.read<LoginBloc>().add(
LoginEvent.login(
LoginParams(
phoneNumber:
"+998${_phoneController.text.trim().replaceAll(" ", "")}",
password: _passwordController.text.trim(),
),
),
);
}
},
borderRadius: 15,

13
lib/feature/auth/presentation/pages/register_page/register_page.dart
View File

@@ -1,6 +1,7 @@
import 'package:food_delivery_client/feature/auth/presentation/pages/register_page/widgets/w_register_body.dart';
import '../../../../../food_delivery_client.dart';
import '../../blocs/register_bloc/register_bloc.dart';
class RegisterPage extends StatelessWidget {
const RegisterPage({super.key, required this.phoneNumber});
@@ -9,6 +10,16 @@ class RegisterPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
return WLayout(top: false, child: Scaffold(body: WRegisterBody()));
return BlocProvider(
create: (context) => sl<RegisterBloc>(),
child: BlocBuilder<RegisterBloc, RegisterState>(
builder: (context, state) {
return WLayout(
top: false,
child: Scaffold(body: WRegisterBody(phoneNumber: phoneNumber)),
);
},
),
);
}
}

292
lib/feature/auth/presentation/pages/register_page/widgets/w_register_body.dart
View File

@@ -1,9 +1,13 @@
import 'package:food_delivery_client/core/helpers/validator_helpers.dart';
import 'package:food_delivery_client/feature/auth/domain/usecases/register_usecase.dart';
import 'package:food_delivery_client/feature/auth/presentation/widgets/w_auth_background.dart';
import '../../../../../../food_delivery_client.dart';
import '../../../blocs/register_bloc/register_bloc.dart';
class WRegisterBody extends StatefulWidget {
const WRegisterBody({super.key});
const WRegisterBody({super.key, required this.phoneNumber});
final String phoneNumber;
@override
State<WRegisterBody> createState() => _WRegisterBodyState();
@@ -40,62 +44,69 @@ class _WRegisterBodyState extends State<WRegisterBody> {
@override
Widget build(BuildContext context) {
return Form(
key: _formKey,
child: WAuthBackground(
child: SizedBox(
width: context.w,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
20.verticalSpace,
Align(
alignment: AlignmentGeometry.center,
child: Text(
context.loc.sign_up,
style: AppTextStyles.size24Bold,
),
),
20.verticalSpace,
Text(
context.loc.first_name,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
hintText: context.loc.enter_first_name,
controller: _firstNameController,
borderRadius: AppUtils.kBorderRadius8,
keyBoardType: TextInputType.name,
validator: (value) {
return Validators.validateFields(
_firstNameController.text.trim(),
);
},
),
10.verticalSpace,
Text(
'Last name',
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
hintText: "Enter LastName",
controller: _lastNameController,
borderRadius: AppUtils.kBorderRadius8,
keyBoardType: TextInputType.text,
validator: (value) {
return Validators.validateFields(
_lastNameController.text.trim(),
);
},
),
10.verticalSpace,
/* Text(
return BlocConsumer<RegisterBloc, RegisterState>(
listener: (context, state) {
if (state.status.isLoaded()) {
context.go(Routes.login);
}
},
builder: (context, state) {
return Form(
key: _formKey,
child: WAuthBackground(
child: SizedBox(
width: context.w,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
20.verticalSpace,
Align(
alignment: AlignmentGeometry.center,
child: Text(
context.loc.sign_up,
style: AppTextStyles.size24Bold,
),
),
20.verticalSpace,
Text(
context.loc.first_name,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
hintText: context.loc.enter_first_name,
controller: _firstNameController,
borderRadius: AppUtils.kBorderRadius8,
keyBoardType: TextInputType.name,
validator: (value) {
return Validators.validateFields(
_firstNameController.text.trim(),
);
},
),
10.verticalSpace,
Text(
'Last name',
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
hintText: "Enter LastName",
controller: _lastNameController,
borderRadius: AppUtils.kBorderRadius8,
keyBoardType: TextInputType.text,
validator: (value) {
return Validators.validateFields(
_lastNameController.text.trim(),
);
},
),
10.verticalSpace,
/* Text(
context.loc.phone_number,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
@@ -121,88 +132,99 @@ class _WRegisterBodyState extends State<WRegisterBody> {
),
*/
10.verticalSpace,
Text(
context.loc.enter_password,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
obscureText: true,
hintText: context.loc.password,
controller: _passwordController,
borderRadius: AppUtils.kBorderRadius8,
keyBoardType: TextInputType.visiblePassword,
validator: (value) {
return Validators.validatePassword(
_passwordController.text.trim(),
);
},
),
10.verticalSpace,
Text(
context.loc.repeat_password,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
obscureText: true,
hintText: context.loc.enter_repeat_password,
controller: _repeatPasswordController,
borderRadius: AppUtils.kBorderRadius8,
keyBoardType: TextInputType.visiblePassword,
validator: (value) {
return Validators.validatePassword(
_repeatPasswordController.text.trim(),
);
},
),
20.verticalSpace,
AppButton(
name: context.loc.continue_str,
borderRadius: 15,
backgroundColor: AppColors.c34A853,
trailing: SvgPicture.asset(
AppIcons.icArrowRightLight,
).paddingOnly(left: 8),
onPressed: () {
if (_formKey.currentState?.validate() ?? false) {
}
},
),
20.verticalSpace,
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
10.verticalSpace,
Text(
context.loc.already_has_account,
style: AppTextStyles.size14Medium,
),
TextButton(
onPressed: () {
context.pushReplacement(Routes.login);
},
child: Text(
context.loc.login,
style: AppTextStyles.size15Bold.copyWith(
color: AppColors.c34A853,
),
context.loc.enter_password,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
obscureText: true,
hintText: context.loc.password,
controller: _passwordController,
borderRadius: AppUtils.kBorderRadius8,
keyBoardType: TextInputType.visiblePassword,
validator: (value) {
return Validators.validatePassword(
_passwordController.text.trim(),
);
},
),
10.verticalSpace,
Text(
context.loc.repeat_password,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
obscureText: true,
hintText: context.loc.enter_repeat_password,
controller: _repeatPasswordController,
borderRadius: AppUtils.kBorderRadius8,
keyBoardType: TextInputType.visiblePassword,
validator: (value) {
return Validators.validateRepeatPassword(
_repeatPasswordController.text.trim(),
_passwordController.text.trim(),
);
},
),
20.verticalSpace,
AppButton(
isLoading: state.status.isLoading(),
name: context.loc.continue_str,
borderRadius: 15,
backgroundColor: AppColors.c34A853,
trailing: SvgPicture.asset(
AppIcons.icArrowRightLight,
).paddingOnly(left: 8),
onPressed: () {
if (_formKey.currentState?.validate() ?? false) {
context.read<RegisterBloc>().add(
RegisterEvent.loaded(
RegisterParams(
phoneNumber: widget.phoneNumber,
password: _passwordController.text.trim(),
firstName: _firstNameController.text.trim(),
lastName: _lastNameController.text.trim(),
),
),
);
}
},
),
20.verticalSpace,
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
context.loc.already_has_account,
style: AppTextStyles.size14Medium,
),
TextButton(
onPressed: () {
context.pushReplacement(Routes.login);
},
child: Text(
context.loc.login,
style: AppTextStyles.size15Bold.copyWith(
color: AppColors.c34A853,
),
),
),
],
),
],
),
],
).paddingSymmetric(horizontal: 16),
),
),
).paddingSymmetric(horizontal: 16),
),
),
);
},
);
}
}

138
lib/feature/auth/presentation/pages/reset_password_page/reset_password_page.dart
View File

@@ -1,21 +1,137 @@
import 'package:food_delivery_client/core/helpers/validator_helpers.dart';
import 'package:food_delivery_client/feature/auth/domain/usecases/reset_password_usecase.dart';
import 'package:food_delivery_client/feature/auth/presentation/blocs/reset_password_bloc/reset_password_bloc.dart';
import 'package:food_delivery_client/feature/auth/presentation/widgets/w_auth_background.dart';
import '../../../../../food_delivery_client.dart';
class ResetPasswordPage extends StatelessWidget {
class ResetPasswordPage extends StatefulWidget {
const ResetPasswordPage({super.key, required this.phoneNumber});
final String phoneNumber;
final String phoneNumber;
@override
State<ResetPasswordPage> createState() => _ResetPasswordPageState();
}
class _ResetPasswordPageState extends State<ResetPasswordPage> {
late TextEditingController _passwordController;
late TextEditingController _repeatPasswordController;
final _formKey = GlobalKey<FormState>();
@override
void initState() {
_passwordController = TextEditingController();
_repeatPasswordController = TextEditingController();
super.initState();
}
@override
void dispose() {
_passwordController.dispose();
_repeatPasswordController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return WLayout(
top: false,
child: Scaffold(
body: WAuthBackground(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [],
),
),
return BlocProvider(
create: (context) => sl<ResetPasswordBloc>(),
child: BlocConsumer<ResetPasswordBloc, ResetPasswordState>(
listener: (context, state) {
if (state.status.isLoaded()) {
context.go(Routes.login);
}
},
builder: (context, state) {
return Form(
key: _formKey,
child: WLayout(
top: false,
child: Scaffold(
body: WAuthBackground(
child: SizedBox(
width: context.w,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
25.verticalSpace,
Text(
context.loc.reset_password,
style: AppTextStyles.size20Medium,
),
20.verticalSpace,
Text(
context.loc.new_password,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
obscureText: true,
controller: _passwordController,
borderRadius: AppUtils.kBorderRadius8,
hintText: context.loc.enter_password,
keyBoardType: TextInputType.visiblePassword,
validator: (value) {
return Validators.validatePassword(
_passwordController.text.trim(),
);
},
),
20.verticalSpace,
Text(
context.loc.password,
style: AppTextStyles.size14Regular.copyWith(
color: AppColors.c6A6E7F,
),
),
5.verticalSpace,
AppTextFormField(
obscureText: true,
controller: _repeatPasswordController,
borderRadius: AppUtils.kBorderRadius8,
hintText: context.loc.enter_password,
keyBoardType: TextInputType.visiblePassword,
validator: (value) {
return Validators.validateRepeatPassword(
_repeatPasswordController.text.trim(),
_passwordController.text.trim(),
);
},
),
25.verticalSpace,
AppButton(
name: context.loc.continue_str,
trailing: SvgPicture.asset(
AppIcons.icArrowRightLight,
).paddingOnly(left: 8),
isLoading: state.status.isLoading(),
onPressed: () {
if (_formKey.currentState?.validate() ?? false) {
context.read<ResetPasswordBloc>().add(
ResetPasswordEvent.loaded(
ResetPasswordParams(
phoneNumber: widget.phoneNumber,
newPassword: _passwordController.text
.trim(),
),
),
);
}
},
backgroundColor: AppColors.c34A853,
borderRadius: 15,
),
],
).paddingSymmetric(horizontal: 16),
),
),
),
),
);
},
),
);
}

76
lib/feature/auth/presentation/pages/verify_otp_code_page/verify_otp_code_page.dart
View File

@@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:food_delivery_client/core/helpers/time_formatters.dart';
import 'package:food_delivery_client/feature/auth/domain/usecases/verify_otp_code_login_usecase.dart';
import 'package:food_delivery_client/feature/auth/presentation/blocs/verify_otp_bloc/verify_otp_bloc.dart';
@@ -68,7 +69,7 @@ class _VerifyOtpCodePageState extends State<VerifyOtpCodePage> {
children: [
40.verticalSpace,
Text(
"Enter the 5-digit code sent to you at ${widget.params.phoneNumber}",
context.loc.enter_otp_code(widget.params.phoneNumber),
style: AppTextStyles.size20Medium,
),
20.verticalSpace,
@@ -98,36 +99,47 @@ class _VerifyOtpCodePageState extends State<VerifyOtpCodePage> {
},
),
10.verticalSpace,
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text("You can resend otp after"),
SizedBox(
height: 40,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
context.loc.resend_otp_after,
style: AppTextStyles.size14Regular,
),
if (state.time != 0)
Text(TimeFormatters.formatMinutesToTime(state.time)),
if (state.time != 0)
Text(
TimeFormatters.formatMinutesToTime(state.time),
),
if (state.time == 0)
state.resendStatus.isLoading()
? CircularProgressIndicator.adaptive()
: TextButton(
onPressed: () {
if (widget.params.isRegister) {
context.read<VerifyOtpBloc>().add(
VerifyOtpEvent.resendRegister(
widget.params.phoneNumber,
),
);
} else {
context.read<VerifyOtpBloc>().add(
VerifyOtpEvent.resendForgot(
widget.params.phoneNumber,
),
);
}
},
child: Text("Resend"),
),
],
if (state.time == 0)
state.resendStatus.isLoading()
? CircularProgressIndicator.adaptive()
: IconButton(
onPressed: () {
if (widget.params.isRegister) {
context.read<VerifyOtpBloc>().add(
VerifyOtpEvent.resendRegister(
widget.params.phoneNumber,
),
);
} else {
context.read<VerifyOtpBloc>().add(
VerifyOtpEvent.resendForgot(
widget.params.phoneNumber,
),
);
}
},
icon: Icon(
CupertinoIcons.restart,
color: AppColors.c000000,
),
),
],
),
),
20.verticalSpace,
@@ -153,9 +165,8 @@ class _VerifyOtpCodePageState extends State<VerifyOtpCodePage> {
VerifyOtpEvent.verifyOtpReset(
VerifyOtpCodeParams(
phoneNumber: widget.params.phoneNumber,
otpCode: _controller.text.trim().substring(
0,
4,
otpCode: int.tryParse(
_controller.text.trim().substring(0, 4),
),
),
),
@@ -163,6 +174,7 @@ class _VerifyOtpCodePageState extends State<VerifyOtpCodePage> {
}
}
},
isLoading: state.status.isLoading(),
backgroundColor: AppColors.c34A853,
borderRadius: 15,
trailing: SvgPicture.asset(

1
lib/feature/auth/presentation/pages/verify_phone_number_page/verify_phone_page.dart
View File

@@ -115,6 +115,7 @@ class _VerifyPhoneNumberPageState extends State<VerifyPhoneNumberPage> {
}
}
},
isLoading: state.status.isLoading(),
name: context.loc.continue_str,
borderRadius: 15,
backgroundColor: AppColors.c34A853,