apoloz/eatvio_app_old
1
0
Fork 0
Code Pull Requests Actions Activity

Merge pull request 'mso7nueh-feat(chat)' (#44) from mso7nueh-feat(chat) into main

Browse Source 
Reviewed-on: maxxkim/eatvio_app#44
This commit is contained in:
mso7nueh
2024-07-03 14:07:36 +00:00
parent 70f6509af8 0a25800038
commit c743c0c614
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/features/feed/presentation/pages/feed_screen.dart
View File

@@ -18,6 +18,15 @@ class FeedScreen extends StatelessWidget {
builder: (BuildContext context, FeedState state) {
if (state is FeedStateLoaded) {
return _buildFeedScreen(context, state);
} else if (state is FeedStateError) {
return Scaffold(
body: Padding(
padding: const EdgeInsets.all(16),
child: Center(
child: Text(state.errorMessage),
),
),
);
} else {
return Scaffold(
body: Center(
@@ -100,8 +109,7 @@ class FeedScreen extends StatelessWidget {
flex: 1,
child: CustomOutlinedButton(
text: "+",
onPressed: () =>
GoRouter.of(context).goNamed('blogPostCreateScreen'),
onPressed: () => GoRouter.of(context).goNamed('blogPostCreateScreen'),
buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
),
),
@@ -220,8 +228,7 @@ class FeedScreen extends StatelessWidget {
imageBuilder: (context, imageProvider) => Stack(
children: [
ClipRRect(
borderRadius:
const BorderRadius.all(Radius.circular(8.0)),
borderRadius: const BorderRadius.all(Radius.circular(8.0)),
child: Image(
image: imageProvider,
),

2
lib/features/feed/repositories/feed_repository.dart
View File

@@ -8,7 +8,7 @@ class FeedRepository {
Future<List<FeedBlogPostModel>> getFeedBlogPostList() async {
try {
return await feedService.getBlocPostList();
return (await feedService.getBlocPostList()).entries.map((entry) => entry.value).toList();
} catch (e) {
rethrow;
}

2
lib/features/feed/services/feed_service.dart
View File

@@ -9,5 +9,5 @@ abstract class FeedService {
factory FeedService(Dio dio, {String baseUrl}) = _FeedService;
@GET('/feed/index')
Future<List<FeedBlogPostModel>> getBlocPostList();
Future<Map<String, FeedBlogPostModel>> getBlocPostList();
}

12
lib/features/feed/services/feed_service.g.dart
View File

@@ -19,13 +19,13 @@ class _FeedService implements FeedService {
String? baseUrl;
@override
Future<List<FeedBlogPostModel>> getBlocPostList() async {
Future<Map<String, FeedBlogPostModel>> getBlocPostList() async {
final _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _headers = <String, dynamic>{};
const Map<String, dynamic>? _data = null;
final _result = await _dio
.fetch<List<dynamic>>(_setStreamType<List<FeedBlogPostModel>>(Options(
final _result = await _dio.fetch<Map<String, dynamic>>(
_setStreamType<Map<String, FeedBlogPostModel>>(Options(
method: 'GET',
headers: _headers,
extra: _extra,
@@ -41,10 +41,8 @@ class _FeedService implements FeedService {
_dio.options.baseUrl,
baseUrl,
))));
var _value = _result.data!
.map((dynamic i) =>
FeedBlogPostModel.fromJson(i as Map<String, dynamic>))
.toList();
var _value = _result.data!.map((k, dynamic v) =>
MapEntry(k, FeedBlogPostModel.fromJson(v as Map<String, dynamic>)));
return _value;
}