apoloz/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

feat(email): verify screen

Browse Source
This commit is contained in:
mso7nueh
2025-05-26 17:56:29 +03:00
parent 51d3c1ad2f
commit 67bf7b0510
12 changed files with 146 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devtools_options.yaml
View File

@@ -1,2 +1,3 @@
extensions:
- provider: true
- shared_preferences: true

6
lib/core/app_router.dart
View File

@@ -44,6 +44,7 @@ import 'package:eatvio_app/features/recipe/presentation/pages/about_recipe_scree
import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
import 'package:eatvio_app/features/recipe/presentation/pages/my_recipes_screen.dart';
import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart';
import 'package:eatvio_app/features/registration/presentation/pages/verify_email_screen.dart';
import 'package:eatvio_app/features/registration/presentation/pages/verify_screen.dart';
import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
import 'package:eatvio_app/features/settings/presentation/pages/change_email_screen.dart';
@@ -359,6 +360,11 @@ class AppRouter {
name: 'verifyScreen',
builder: (context, state) => VerifyScreen(passKey: state.extra as String),
),
GoRoute(
path: '/verify-email-screen',
name: 'verifyEmailScreen',
builder: (context, state) => const VerifyEmailScreen(),
),
GoRoute(
path: MyRecipesScreen.path,
name: MyRecipesScreen.name,

2
lib/core/locator_service.dart
View File

@@ -84,6 +84,7 @@ import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit
import 'package:eatvio_app/features/recipe/repositories/about_recipe_repository.dart';
import 'package:eatvio_app/features/recipe/services/about_recipe_service.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
import 'package:eatvio_app/features/registration/services/registration_service.dart';
import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
@@ -138,6 +139,7 @@ Future<void> init() async {
sl.registerFactory<ConsultationsCubit>(() => ConsultationsCubit(consultationsRepository: sl()));
sl.registerFactory<ConsultantCommentsCubit>(() => ConsultantCommentsCubit(diaryRepository: sl()));
sl.registerFactory<CancelPlanCubit>(() => CancelPlanCubit(cancelPlanRepository: sl()));
sl.registerFactory<VerifyEmailCubit>(() => VerifyEmailCubit(profileRepository: sl()));
// Repository
sl.registerLazySingleton<ChatRepository>(() => ChatRepository(chatService: sl()));

3
lib/features/diets/presentation/widgets/author_card.dart
View File

@@ -1,3 +1,4 @@
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
import 'package:eatvio_app/core/theme/custom_text_style.dart';
@@ -36,7 +37,7 @@ class AuthorCard extends StatelessWidget {
decoration: BoxDecoration(
shape: BoxShape.circle,
image: DecorationImage(
image: NetworkImage(author.authorProfileIcon),
image: NetworkImage(baseUrl + author.authorProfileIcon),
fit: BoxFit.cover,
),
),

3
lib/features/feed/presentation/widgets/comments_widget.dart
View File

@@ -1,3 +1,4 @@
import 'package:eatvio_app/core/const.dart';
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/utils/date_time_utils.dart';
import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
@@ -77,7 +78,7 @@ class _CommentsWidgetState extends State<CommentsWidget> {
);
},
child: CircleAvatar(
foregroundImage: NetworkImage(comment.authorProfileIcon),
foregroundImage: NetworkImage(baseUrl + comment.authorProfileIcon),
backgroundImage: const AssetImage('assets/images/no_avatar.png'),
radius: radius,
),

1
lib/features/menu/presentation/pages/menu_screen.dart
View File

@@ -58,6 +58,7 @@ class MenuScreen extends StatelessWidget {
),
_divider(context),
_tile(leading: ImageConstant.icnExit, title: 'Выход', onTap: _onTapLogout(context)),
_tile(leading: ImageConstant.icnExit, title: 'Verify email', onTap: () => GoRouter.of(context).pushNamed('verifyEmailScreen')),
],
),
),

12
lib/features/profile/repositories/profile_repository.dart
View File

@@ -183,7 +183,8 @@ class ProfileRepository {
}
Future<String> getPassKey(String phone) async {
return (jsonDecode((await profileService.getPassKey(json: '{"route_name": "user_detailz.change-phone-verify", "route_params": {"phone": "$phone"}}'))))['key_is']!;
return (jsonDecode(
(await profileService.getPassKey(json: '{"route_name": "user_detailz.change-phone-verify", "route_params": {"phone": "$phone"}}'))))['key_is']!;
}
Future<String> getMyPhone() async {
@@ -194,7 +195,12 @@ class ProfileRepository {
return await profileService.sendEmailCode();
}
Future<void> tryVerifyEmailByCode(String code) async {
return await profileService.tryVerifyEmailByCode(code: "{\"code\": \"$code\"}");
Future<bool> tryVerifyEmailByCode(String code) async {
try {
await profileService.tryVerifyEmailByCode(code: "{\"code\": \"$code\"}");
return true;
} catch (e) {
return false;
}
}
}

35
lib/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart Normal file
View File

@@ -0,0 +1,35 @@
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_state.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
class VerifyEmailCubit extends Cubit<VerifyEmailState> {
final ProfileRepository profileRepository;
VerifyEmailCubit({
required this.profileRepository,
}) : super(const VerifyEmailState.loading());
sendEmailCode() async {
try {
final profile = await profileRepository.getMyProfile();
await profileRepository.sendEmailCode();
emit(VerifyEmailState.loaded(email: profile.email));
} catch (e) {
emit(const VerifyEmailState.error(errorMessage: 'Ошибка отправки кода.\nПовторите попытку позже'));
}
}
tryVerify(String code) async {
try {
emit(const VerifyEmailState.verifyLoading());
final result = await profileRepository.tryVerifyEmailByCode(code);
if (result == true) {
emit(const VerifyEmailState.verifySuccess());
} else {
emit(const VerifyEmailState.verifyError());
}
} catch (e) {
emit(const VerifyEmailState.verifyError());
}
}
}

24
lib/features/registration/presentation/bloc/verify_email_cubit/verify_email_state.dart Normal file
View File

@@ -0,0 +1,24 @@
import 'package:freezed_annotation/freezed_annotation.dart';
part 'verify_email_state.freezed.dart';
@freezed
abstract class VerifyEmailState with _$VerifyEmailState {
const factory VerifyEmailState.loading() = VerifyEmailStateLoading;
const factory VerifyEmailState.loaded({
required String email,
}) = VerifyEmailStateLoaded;
const factory VerifyEmailState.error({
required String errorMessage,
}) = VerifyEmailStateError;
const factory VerifyEmailState() = _VerifyEmailState;
const factory VerifyEmailState.verifyLoading() = VerifyEmailStateVerifyLoading;
const factory VerifyEmailState.verifySuccess() = VerifyEmailStateVerifySuccess;
const factory VerifyEmailState.verifyError() = VerifyEmailStateVerifyError;
}

52
lib/features/registration/presentation/pages/verify_email_screen.dart
View File

@@ -1,4 +1,10 @@
import 'package:eatvio_app/core/locator_service.dart';
import 'package:eatvio_app/core/utils/toasts.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_state.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
class VerifyEmailScreen extends StatefulWidget {
const VerifyEmailScreen({super.key});
@@ -10,6 +16,7 @@ class VerifyEmailScreen extends StatefulWidget {
class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
final List<FocusNode> _focusNodes = List.generate(4, (_) => FocusNode());
final List<TextEditingController> _controllers = List.generate(4, (_) => TextEditingController());
String email = '';
@override
void dispose() {
@@ -22,8 +29,35 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
super.dispose();
}
void _checkAndSubmitCode(BuildContext context) {
final code = _controllers.map((c) => c.text).join();
if (code.length == 4) {
context.read<VerifyEmailCubit>().tryVerify(code);
}
}
@override
Widget build(BuildContext context) {
return BlocProvider<VerifyEmailCubit>(
create: (_) => sl<VerifyEmailCubit>()..sendEmailCode(),
child: BlocConsumer<VerifyEmailCubit, VerifyEmailState>(
listener: (context, state) {
if (state is VerifyEmailStateLoaded) {
setState(() {
email = state.email;
});
} else if (state is VerifyEmailStateVerifySuccess) {
showSuccessToast('Почта успешно подтверждена');
GoRouter.of(context).pop();
} else if (state is VerifyEmailStateVerifyError) {
showErrorToast("Неверный код. Попробуйте снова.");
for (var controller in _controllers) {
controller.clear();
}
FocusScope.of(context).requestFocus(_focusNodes[0]);
}
},
builder: (context, state) {
return Scaffold(
appBar: AppBar(title: const Text("Подтвердите почту")),
body: Padding(
@@ -31,27 +65,30 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Text("Код отправлен на почту\nnazvanie@mail.com", textAlign: TextAlign.center),
Text("Код отправлен на почту\n$email", textAlign: TextAlign.center),
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: List.generate(4, (index) => _buildCodeField(index)),
children: List.generate(4, (index) => _buildCodeField(context, index)),
),
const SizedBox(height: 20),
const Text("Запросить код повторно", style: TextStyle(color: Colors.grey)),
TextButton(
onPressed: () {
// логика запроса нового кода
context.read<VerifyEmailCubit>().sendEmailCode();
},
child: const Text("Не приходит код?"),
)
),
],
),
),
);
},
),
);
}
Widget _buildCodeField(int index) {
Widget _buildCodeField(BuildContext context, int index) {
return SizedBox(
width: 50,
child: TextField(
@@ -63,9 +100,7 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
style: const TextStyle(fontSize: 24),
decoration: InputDecoration(
counterText: "",
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8.0),
),
border: OutlineInputBorder(borderRadius: BorderRadius.circular(8.0)),
),
onChanged: (value) {
if (value.isNotEmpty && index < 3) {
@@ -74,6 +109,7 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
if (value.isEmpty && index > 0) {
FocusScope.of(context).requestFocus(_focusNodes[index - 1]);
}
_checkAndSubmitCode(context);
},
),
);

1
lib/features/registration/presentation/pages/verify_screen.dart
View File

@@ -69,7 +69,6 @@ class _VerifyScreenState extends State<VerifyScreen> {
InkWell(
onTap: () {
Navigator.of(context).pop();
GoRouter.of(context).pop();
},
child: Ink(
width: MediaQuery.of(context).size.width - 32,

1
pubspec.yaml
View File

@@ -79,6 +79,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
flutter: