diff --git a/lib/presentation/chat/chat_screen/bloc/chat_bloc.dart b/lib/presentation/chat/chat_screen/bloc/chat_bloc.dart index 15319c23..8c33f02b 100644 --- a/lib/presentation/chat/chat_screen/bloc/chat_bloc.dart +++ b/lib/presentation/chat/chat_screen/bloc/chat_bloc.dart @@ -1,8 +1,10 @@ +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:hive/hive.dart'; import 'package:http/http.dart' as http; +import 'package:go_router/go_router.dart'; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/chat/chat_screen/models/chat_model.dart'; @@ -24,7 +26,7 @@ class ChatBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final String? chatID = state.chatModelObj?.chatID; final response = await http.get( diff --git a/lib/presentation/chat/chat_select_screen/bloc/chat_select_bloc.dart b/lib/presentation/chat/chat_select_screen/bloc/chat_select_bloc.dart index fe6d0a72..b71f87c2 100644 --- a/lib/presentation/chat/chat_select_screen/bloc/chat_select_bloc.dart +++ b/lib/presentation/chat/chat_select_screen/bloc/chat_select_bloc.dart @@ -1,3 +1,4 @@ +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; @@ -8,7 +9,9 @@ import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/chat/chat_select_screen/models/chat_select_model.dart'; -import 'package:eatvio_app/presentation/chat/chat_select_screen/models/chat_entry.dart'; // ignore: must_be_immutable +import 'package:eatvio_app/presentation/chat/chat_select_screen/models/chat_entry.dart'; +import 'package:go_router/go_router.dart'; + part 'chat_select_event.dart'; part 'chat_select_state.dart'; @@ -47,7 +50,7 @@ class ChatSelectBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( Uri.parse(dotenv.env['SERVER_ROOT']! + '/chat/index'), diff --git a/lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart b/lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart index 21e7dbdd..5776d70f 100644 --- a/lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart +++ b/lib/presentation/diets/diet_select_screen/bloc/diet_select_bloc.dart @@ -28,7 +28,7 @@ class DietSelectBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( Uri.parse(dotenv.env['SERVER_ROOT']! + '/diets/index'), diff --git a/lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart b/lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart index 7c11ea66..5c60a1d2 100644 --- a/lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart +++ b/lib/presentation/diets/diet_show_screen/bloc/diet_show_bloc.dart @@ -26,7 +26,7 @@ class DietBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final String? dietID = state.dietModelObj?.dietID; final response = await http.get( @@ -65,9 +65,7 @@ class DietBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final int id = event.id; final response = await http.post( diff --git a/lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart b/lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart index 5fb90f4d..3f5d95e3 100644 --- a/lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart +++ b/lib/presentation/feed/blog_post_create_screen/bloc/blog_post_create_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -8,6 +9,7 @@ import 'package:http/http.dart' as http; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/feed/blog_post_create_screen/models/blog_post_create_model.dart'; +import 'package:go_router/go_router.dart'; part 'blog_post_create_event.dart'; part 'blog_post_create_state.dart'; @@ -26,7 +28,7 @@ class BlogPostCreateBloc final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } if (state is BlogPostCreateLoadedState) { var currentState = state as BlogPostCreateLoadedState; diff --git a/lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart b/lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart index 9783704b..1810faff 100644 --- a/lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart +++ b/lib/presentation/feed/blog_post_edit_screen/bloc/blog_post_edit_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -8,6 +9,7 @@ import 'package:http/http.dart' as http; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/feed/blog_post_edit_screen/models/blog_post_edit_model.dart'; +import 'package:go_router/go_router.dart'; part 'blog_post_edit_event.dart'; part 'blog_post_edit_state.dart'; @@ -26,7 +28,7 @@ class BlogPostEditBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final String? blog_postID = state.blog_postModelObj?.blog_postID; final response = await http.get( diff --git a/lib/presentation/feed/blog_post_screen/bloc/blog_post_bloc.dart b/lib/presentation/feed/blog_post_screen/bloc/blog_post_bloc.dart index d26638db..19f0c703 100644 --- a/lib/presentation/feed/blog_post_screen/bloc/blog_post_bloc.dart +++ b/lib/presentation/feed/blog_post_screen/bloc/blog_post_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:eatvio_app/presentation/feed/blog_post_screen/models/comment_model.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; @@ -10,6 +11,7 @@ import 'package:intl/intl.dart'; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/feed/blog_post_screen/models/blog_post_model.dart'; +import 'package:go_router/go_router.dart'; part 'blog_post_event.dart'; part 'blog_post_state.dart'; @@ -29,7 +31,7 @@ class BlogPostBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final String? blog_postID = state.blog_postModelObj?.blog_postID; final response = await http.get( @@ -96,9 +98,7 @@ class BlogPostBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final int id = event.id; final response = await http.post( @@ -120,9 +120,7 @@ class BlogPostBloc extends Bloc { final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( @@ -139,9 +137,7 @@ class BlogPostBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( Uri.parse(dotenv.env['SERVER_ROOT']! + '/feed/getComments/$id'), diff --git a/lib/presentation/feed/feed_screen/bloc/feed_bloc.dart b/lib/presentation/feed/feed_screen/bloc/feed_bloc.dart index 0040ad24..1eda1feb 100644 --- a/lib/presentation/feed/feed_screen/bloc/feed_bloc.dart +++ b/lib/presentation/feed/feed_screen/bloc/feed_bloc.dart @@ -1,6 +1,7 @@ //import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import '/core/app_export.dart'; @@ -10,6 +11,7 @@ import 'dart:convert'; import 'package:hive/hive.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:go_router/go_router.dart'; part 'feed_event.dart'; part 'feed_state.dart'; @@ -28,7 +30,7 @@ class FeedBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( Uri.parse(dotenv.env['SERVER_ROOT']! + '/feed/index'), diff --git a/lib/presentation/glossary/glossary_screen/bloc/glossary_screen_bloc.dart b/lib/presentation/glossary/glossary_screen/bloc/glossary_screen_bloc.dart index c40fd218..5f63f293 100644 --- a/lib/presentation/glossary/glossary_screen/bloc/glossary_screen_bloc.dart +++ b/lib/presentation/glossary/glossary_screen/bloc/glossary_screen_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -8,6 +9,7 @@ import 'package:http/http.dart' as http; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/glossary/glossary_screen/models/glossary_screen_model.dart'; +import 'package:go_router/go_router.dart'; part 'glossary_screen_event.dart'; part 'glossary_screen_state.dart'; @@ -26,7 +28,7 @@ class GlossaryBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final responseProductGroups = await http.get( Uri.parse(dotenv.env['SERVER_ROOT']! + '/glossary/getProductGroups'), diff --git a/lib/presentation/plans/plan_create_screen/bloc/plan_create_bloc.dart b/lib/presentation/plans/plan_create_screen/bloc/plan_create_bloc.dart index 5569baec..a74e40ec 100644 --- a/lib/presentation/plans/plan_create_screen/bloc/plan_create_bloc.dart +++ b/lib/presentation/plans/plan_create_screen/bloc/plan_create_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -8,6 +9,7 @@ import 'package:http/http.dart' as http; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/plans/plan_create_screen/models/plan_create_model.dart'; +import 'package:go_router/go_router.dart'; part 'plan_create_event.dart'; part 'plan_create_state.dart'; @@ -25,7 +27,7 @@ class PlanCreateBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } if (state is PlanCreateLoadedState) { var currentState = state as PlanCreateLoadedState; diff --git a/lib/presentation/plans/plan_edit_screen/bloc/plan_edit_bloc.dart b/lib/presentation/plans/plan_edit_screen/bloc/plan_edit_bloc.dart index a8051c15..584f9d27 100644 --- a/lib/presentation/plans/plan_edit_screen/bloc/plan_edit_bloc.dart +++ b/lib/presentation/plans/plan_edit_screen/bloc/plan_edit_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -8,6 +9,7 @@ import 'package:http/http.dart' as http; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/plans/plan_edit_screen/models/plan_edit_model.dart'; +import 'package:go_router/go_router.dart'; part 'plan_edit_event.dart'; part 'plan_edit_state.dart'; @@ -26,7 +28,7 @@ class PlanEditBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final String? planID = state.planModelObj?.planID; final response = await http.get( diff --git a/lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart b/lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart index e53e6582..b74c0ede 100644 --- a/lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart +++ b/lib/presentation/plans/plan_select_screen/bloc/plan_select_bloc.dart @@ -1,6 +1,7 @@ //import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import '/core/app_export.dart'; @@ -10,6 +11,7 @@ import 'dart:convert'; import 'package:hive/hive.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:go_router/go_router.dart'; part 'plan_select_event.dart'; part 'plan_select_state.dart'; @@ -28,7 +30,7 @@ class PlanSelectBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( Uri.parse(dotenv.env['SERVER_ROOT']! + '/plans/index'), diff --git a/lib/presentation/plans/plan_show_screen/bloc/plan_show_bloc.dart b/lib/presentation/plans/plan_show_screen/bloc/plan_show_bloc.dart index 654f3ec6..1c29624b 100644 --- a/lib/presentation/plans/plan_show_screen/bloc/plan_show_bloc.dart +++ b/lib/presentation/plans/plan_show_screen/bloc/plan_show_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -8,6 +9,7 @@ import 'package:http/http.dart' as http; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/plans/plan_show_screen/models/plan_show_model.dart'; +import 'package:go_router/go_router.dart'; part 'plan_show_event.dart'; part 'plan_show_state.dart'; @@ -26,7 +28,7 @@ class PlanBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final String? planID = state.planModelObj?.planID; final response = await http.get( @@ -65,9 +67,7 @@ class PlanBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final int id = event.id; final response = await http.post( diff --git a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart b/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart index b0359fd1..af5fb779 100644 --- a/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart +++ b/lib/presentation/profile/my_profile_screen/bloc/my_profile_bloc.dart @@ -1,6 +1,7 @@ //import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import '/core/app_export.dart'; @@ -10,6 +11,7 @@ import 'dart:convert'; import 'package:hive/hive.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:go_router/go_router.dart'; part 'my_profile_event.dart'; part 'my_profile_state.dart'; @@ -29,9 +31,7 @@ class MyProfileBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); // Если токен есть, запускаем приложение + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } //final token = // "9|laravel_sanctum_KFXbccDcWEvTPfJmV99EQv1ne AggmpR2TidVGDPN34fa201a"; diff --git a/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_bloc.dart b/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_bloc.dart index 483dcd38..1b28e101 100644 --- a/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_bloc.dart +++ b/lib/presentation/recipe/recipe_create_screen/bloc/recipe_create_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -8,6 +9,7 @@ import 'package:http/http.dart' as http; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/recipe/recipe_create_screen/models/recipe_create_model.dart'; +import 'package:go_router/go_router.dart'; part 'recipe_create_event.dart'; part 'recipe_create_state.dart'; @@ -28,7 +30,7 @@ class RecipeCreateBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } if (state is RecipeCreateLoadedState) { var currentState = state as RecipeCreateLoadedState; @@ -144,9 +146,7 @@ class RecipeCreateBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } if (state is RecipeCreateLoadedState) { var currentState = state as RecipeCreateLoadedState; diff --git a/lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart b/lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart index eb87a144..4a5fce40 100644 --- a/lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart +++ b/lib/presentation/recipe/recipe_edit_screen/bloc/recipe_edit_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -8,6 +9,7 @@ import 'package:http/http.dart' as http; import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/recipe/recipe_edit_screen/models/recipe_edit_model.dart'; +import 'package:go_router/go_router.dart'; part 'recipe_edit_event.dart'; part 'recipe_edit_state.dart'; @@ -29,7 +31,7 @@ class RecipeEditBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final String? recipeID = state.recipeModelObj?.recipeID; final response = await http.get( @@ -194,9 +196,7 @@ class RecipeEditBloc extends Bloc { final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( @@ -215,9 +215,7 @@ class RecipeEditBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } if (state is RecipeEditLoadedState) { var currentState = state as RecipeEditLoadedState; diff --git a/lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart b/lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart index b597cbbc..a7b0d375 100644 --- a/lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart +++ b/lib/presentation/recipe/recipe_select_screen/bloc/recipe_select_bloc.dart @@ -1,6 +1,6 @@ -//import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart'; import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import '/core/app_export.dart'; @@ -10,6 +10,7 @@ import 'dart:convert'; import 'package:hive/hive.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:image_picker/image_picker.dart'; +import 'package:go_router/go_router.dart'; part 'recipe_select_event.dart'; part 'recipe_select_state.dart'; @@ -28,7 +29,7 @@ class RecipeSelectBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( Uri.parse(dotenv.env['SERVER_ROOT']! + '/recipe/index'), diff --git a/lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart b/lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart index b431b045..aaf8c62d 100644 --- a/lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart +++ b/lib/presentation/recipe/recipe_show_screen/bloc/recipe_show_bloc.dart @@ -1,5 +1,6 @@ import 'dart:async'; +import 'package:eatvio_app/app_router.dart'; import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_dotenv/flutter_dotenv.dart'; @@ -10,6 +11,7 @@ import 'dart:convert'; import '/core/app_export.dart'; import 'package:eatvio_app/presentation/recipe/recipe_show_screen/models/recipe_show_model.dart'; import 'package:eatvio_app/presentation/feed/blog_post_screen/models/comment_model.dart'; +import 'package:go_router/go_router.dart'; part 'recipe_show_event.dart'; part 'recipe_show_state.dart'; @@ -29,7 +31,7 @@ class RecipeBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - // go to auth screen + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final String? recipeID = state.recipeModelObj?.recipeID; final response = await http.get( @@ -80,9 +82,7 @@ class RecipeBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final int id = event.id; final response = await http.post( @@ -124,9 +124,7 @@ class RecipeBloc extends Bloc { final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( @@ -143,9 +141,7 @@ class RecipeBloc extends Bloc { final box = await Hive.openBox('token'); final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( Uri.parse(dotenv.env['SERVER_ROOT']! + '/recipe/getComments/$id'), @@ -162,9 +158,7 @@ class RecipeBloc extends Bloc { final token = box.get('token'); if (token == null) { - NavigatorService.popAndPushNamed( - AppRoutes.authScreen, - ); + AppRouter.navigatorKey.currentContext?.goNamed('authScreen'); } final response = await http.get( diff --git a/lib/routes/app_routes.dart b/lib/routes/app_routes.dart index f763336c..d3183f01 100644 --- a/lib/routes/app_routes.dart +++ b/lib/routes/app_routes.dart @@ -38,7 +38,7 @@ import 'package:eatvio_app/presentation/feed/blog_post_edit_screen/blog_post_edi import 'package:eatvio_app/presentation/feed/blog_post_create_screen/blog_post_create_screen.dart'; import 'package:eatvio_app/presentation/glossary/glossary_screen/glossary_screen.dart'; -class AppRoutes { +class AppRoutesq { // REGISTRATION static const String dateOfBirthScreen = '/date_of_birth_screen';