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

fix(recipe): Fix

Browse Source
This commit is contained in:
maxxkim
2024-08-16 15:49:26 +03:00
parent 92d5437e06
commit 684b2eec9d
6 changed files with 103 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/features/recipes/presentation/bloc/recipe_create_cubit.dart
View File

@@ -145,6 +145,10 @@ class RecipeCreateCubit extends Cubit<RecipeCreateState> {
await recipeRepository.publishRecipe(recipe);
}
editRecipe(RecipeModel recipe, String id) async {
await recipeRepository.editRecipe(recipe, id);
}
uploadRecipeImage(XFile? pickedFile) {
try {
if (state is RecipeCreateStateLoaded) {

33
lib/features/recipes/presentation/pages/recipe_create_screen.dart
View File

@@ -1,3 +1,4 @@
import 'dart:convert';
import 'dart:io';
import 'package:eatvio_app/core/app_export.dart';
import 'package:eatvio_app/features/diary/models/product.dart';
@@ -17,6 +18,7 @@ import 'package:image_picker/image_picker.dart';
class RecipeCreateScreen extends StatelessWidget {
RecipeCreateScreen({Key? key}) : super(key: key);
Widget build(BuildContext context) {
context.read<RecipeCreateCubit>().loadRecipeCreate();
return BlocBuilder<RecipeCreateCubit, RecipeCreateState>(
builder: (context, state) {
if (state is RecipeCreateStateLoaded) {
@@ -53,8 +55,29 @@ class RecipeCreateScreen extends StatelessWidget {
List<String> _options = state.autocompleteList.map((Product item) => item.name).toList();
return Scaffold(
appBar: AppBar(
toolbarHeight: 0,
automaticallyImplyLeading: false,
actions: [
InkWell(
borderRadius: BorderRadius.circular(16),
child: Ink(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(height: 4),
Text(
'Новый рецепт',
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontWeight: FontWeight.w400,
height: 1,
),
),
],
),
),
),
],
),
backgroundColor: Color.fromARGB(255, 240, 242, 245),
resizeToAvoidBottomInset: true,
@@ -145,7 +168,7 @@ class RecipeCreateScreen extends StatelessWidget {
optionsBuilder: _buildOptions(_options),
fieldViewBuilder: (
BuildContext context,
productEditingController,
TextEditingController productEditingController,
FocusNode focusNodeName,
VoidCallback onFieldSubmitted,
) {
@@ -472,9 +495,7 @@ class RecipeCreateScreen extends StatelessWidget {
image: state.recipeImage?.path,
video_url: state.youtubeLinkController.text.isNotEmpty ? state.youtubeLinkController.text : null,
);
print(recipe.toJson());
print(recipe.toString());
print(recipe);
print(jsonDecode(jsonEncode(recipe)));
return recipe;
}
}

29
lib/features/recipes/presentation/pages/recipe_edit_screen.dart
View File

@@ -59,8 +59,29 @@ class RecipeEditScreen extends StatelessWidget {
List<String> _options = state.autocompleteList.map((Product item) => item.name).toList();
return Scaffold(
appBar: AppBar(
toolbarHeight: 0,
automaticallyImplyLeading: false,
actions: [
InkWell(
borderRadius: BorderRadius.circular(16),
child: Ink(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(height: 4),
Text(
state.titleController.text,
style: TextStyle(
color: Colors.black,
fontSize: 14,
fontWeight: FontWeight.w400,
height: 1,
),
),
],
),
),
),
],
),
backgroundColor: Color.fromARGB(255, 240, 242, 245),
resizeToAvoidBottomInset: true,
@@ -155,7 +176,7 @@ class RecipeEditScreen extends StatelessWidget {
optionsBuilder: _buildOptions(_options),
fieldViewBuilder: (
BuildContext context,
productEditingController,
TextEditingController productEditingController,
FocusNode focusNodeName,
VoidCallback onFieldSubmitted,
) {
@@ -304,7 +325,7 @@ class RecipeEditScreen extends StatelessWidget {
borderRadius: BorderRadius.circular(8),
),
backgroundColor: appTheme.blueA400,
onPressed: () => context.read<RecipeCreateCubit>().publishRecipe(createRecipeFromState(state)),
onPressed: () => context.read<RecipeCreateCubit>().editRecipe(createRecipeFromState(state), recipeID),
label: Text(
'Опубликовать',
style: theme.textTheme.titleSmall,

12
lib/features/recipes/reporitories/recipe_repository.dart
View File

@@ -1,3 +1,5 @@
import 'dart:convert';
import 'package:eatvio_app/features/recipes/models/recipe_model.dart';
import 'package:eatvio_app/features/recipes/services/recipe_service.dart';
import 'package:eatvio_app/features/diary/models/product.dart';
@@ -17,7 +19,15 @@ class RecipeRepository {
Future<RecipeModel> publishRecipe(RecipeModel recipe) async {
try {
return await recipeService.publishRecipe(recipe);
return await recipeService.publishRecipe(jsonDecode(jsonEncode(recipe)));
} catch (e) {
rethrow;
}
}
Future<RecipeModel> editRecipe(RecipeModel recipe, String id) async {
try {
return await recipeService.editRecipe(jsonDecode(jsonEncode(recipe)), id);
} catch (e) {
rethrow;
}

5
lib/features/recipes/services/recipe_service.dart
View File

@@ -16,5 +16,8 @@ abstract class RecipeService {
Future<Map<String, List<Product>>> getInputProduct(@Query('name') String name);
@POST('/api/recipes/create')
Future<RecipeModel> publishRecipe(RecipeModel recipe);
Future<RecipeModel> publishRecipe(@Part() Map<String, Object?> recipe);
@POST('/api/recipes/update/{id}')
Future<RecipeModel> editRecipe(@Part() Map<String, Object?> recipe, String id);
}

34
lib/features/recipes/services/recipe_service.g.dart
View File

@@ -77,11 +77,11 @@ class _RecipeService implements RecipeService {
}
@override
Future<RecipeModel> publishRecipe(RecipeModel recipe) async {
Future<RecipeModel> publishRecipe(Map<String, Object?> recipe) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
const Map<String, dynamic>? _data = null;
final _data = FormData.fromMap(recipe);
final _result = await _dio
.fetch<Map<String, dynamic>>(_setStreamType<RecipeModel>(Options(
method: 'POST',
@@ -103,6 +103,36 @@ class _RecipeService implements RecipeService {
return _value;
}
@override
Future<RecipeModel> editRecipe(
Map<String, Object?> recipe,
String id,
) async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
final _data = FormData.fromMap(recipe);
final _result = await _dio
.fetch<Map<String, dynamic>>(_setStreamType<RecipeModel>(Options(
method: 'POST',
headers: _headers,
extra: _extra,
)
.compose(
_dio.options,
'/api/recipes/update/{id}',
queryParameters: queryParameters,
data: _data,
)
.copyWith(
baseUrl: _combineBaseUrls(
_dio.options.baseUrl,
baseUrl,
))));
final _value = RecipeModel.fromJson(_result.data!);
return _value;
}
RequestOptions _setStreamType<T>(RequestOptions requestOptions) {
if (T != dynamic &&
!(requestOptions.responseType == ResponseType.bytes ||