Compare commits
No commits in common. "68c806408312ba47e03c22e137c9c319c9004463" and "c389381b1e72f84b919ce065d080f5d387ac3e11" have entirely different histories.
68c8064083
...
c389381b1e
@ -13,7 +13,7 @@ enum ApiService {
|
||||
}
|
||||
|
||||
Future<String?> request(BuildContext? context, ApiService service, String method, String path, dynamic body) async {
|
||||
var debug = '$method $path\n $body\n';
|
||||
debugPrint('$method $path');
|
||||
|
||||
final messenger = context != null ? ScaffoldMessenger.of(context) : null;
|
||||
final prefs = await SharedPreferences.getInstance();
|
||||
@ -49,22 +49,18 @@ Future<String?> request(BuildContext? context, ApiService service, String method
|
||||
);
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('Can\'t send requst: ' + e.toString());
|
||||
messenger?.showSnackBar(const SnackBar(content: Text('Unable to connect to server')));
|
||||
|
||||
debug += 'FAILED\n $e';
|
||||
debugPrint(debug);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
debug += 'HTTP ${response.statusCode}\n ${response.body}';
|
||||
debugPrint(debug);
|
||||
|
||||
if (response.statusCode < 200 || response.statusCode >= 300) {
|
||||
try {
|
||||
final json = jsonDecode(response.body);
|
||||
messenger?.showSnackBar(SnackBar(content: Text(json['message'] ?? json['title'])));
|
||||
debugPrint('API error: ' + json['message']);
|
||||
} catch (e) {
|
||||
debugPrint('Can\'t parse response: ' + response.body);
|
||||
messenger?.showSnackBar(SnackBar(content: Text('Something went wrong (HTTP ${response.statusCode})')));
|
||||
}
|
||||
return null;
|
||||
|
||||
@ -14,14 +14,10 @@ class ReviewListPage extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _ReviewListState extends State<ReviewListPage> {
|
||||
List<models.User> _users = [];
|
||||
List<models.User> users = [];
|
||||
|
||||
models.User? _getReviewUser(models.Review review) {
|
||||
try {
|
||||
return _users.firstWhere((user) => user.id == review.userId);
|
||||
} catch(e) {
|
||||
return null;
|
||||
}
|
||||
return users.firstWhere((user) => user.id == review.userId);
|
||||
}
|
||||
|
||||
@override
|
||||
@ -31,18 +27,14 @@ class _ReviewListState extends State<ReviewListPage> {
|
||||
final arg = ModalRoute.of(context)!.settings.arguments as models.ReviewList;
|
||||
final reviews = arg.reviews;
|
||||
|
||||
if (reviews.isEmpty) {
|
||||
return;
|
||||
}
|
||||
|
||||
final userIds = reviews.map((review) => review.userId).toSet().toList();
|
||||
|
||||
final response = await api.request(context, api.ApiService.auth, 'GET', '/api/Users/UsersByIds?userIds=' + userIds.join(','), null);
|
||||
if (response == null) return;
|
||||
|
||||
setState(() {
|
||||
_users = (jsonDecode(response) as List<dynamic>).map((user) => models.User.fromJson(user)).toList();
|
||||
});
|
||||
debugPrint('response: ' + response);
|
||||
|
||||
users = (jsonDecode(response) as List<dynamic>).map((user) => models.User.fromJson(user)).toList();
|
||||
}
|
||||
|
||||
@override
|
||||
@ -55,73 +47,56 @@ class _ReviewListState extends State<ReviewListPage> {
|
||||
selectedIndex: -1,
|
||||
body: Scaffold(
|
||||
backgroundColor: const Color(0xFFF9F9F9),
|
||||
body: reviews.isEmpty
|
||||
? const Center(child: Text('No reviews yet. Be the first to review this place'))
|
||||
: SingleChildScrollView(child: Container(
|
||||
decoration: const BoxDecoration(color: Color(0xFFF9F9F9)),
|
||||
width: MediaQuery.of(context).size.width,
|
||||
padding: const EdgeInsets.all(20.0),
|
||||
child: Column(children: [
|
||||
for (final review in reviews)
|
||||
Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(20),
|
||||
margin: const EdgeInsets.only(bottom: 10),
|
||||
decoration: const BoxDecoration(
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Color(0x20000000),
|
||||
offset: Offset(0,1),
|
||||
blurRadius: 4,
|
||||
),
|
||||
],
|
||||
color: Colors.white,
|
||||
body: SingleChildScrollView(child: Container(
|
||||
decoration: const BoxDecoration(color: Color(0xFFF9F9F9)),
|
||||
width: MediaQuery.of(context).size.width,
|
||||
padding: const EdgeInsets.all(20.0),
|
||||
child: Column(children:
|
||||
reviews.map((review) => Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(20),
|
||||
margin: const EdgeInsets.only(bottom: 10),
|
||||
decoration: const BoxDecoration(
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Color(0x20000000),
|
||||
offset: Offset(0,1),
|
||||
blurRadius: 4,
|
||||
),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 3),
|
||||
child:
|
||||
_getReviewUser(review)?.profilePicture.isNotEmpty == true
|
||||
? ClipOval(
|
||||
child: Image(
|
||||
image: NetworkImage(_getReviewUser(review)!.profilePicture),
|
||||
height: 36,
|
||||
width: 36,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
)
|
||||
: const Icon(
|
||||
Icons.account_circle,
|
||||
size: 36,
|
||||
color: Colors.grey,
|
||||
)
|
||||
),
|
||||
const SizedBox(width: 20),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(review.title, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 24)),
|
||||
Text(review.content),
|
||||
const SizedBox(height: 10),
|
||||
if (review.image != null) Image.network(review.image!.imageUrl, height: 200),
|
||||
if (review.image != null) const SizedBox(height: 15),
|
||||
Row(children: [
|
||||
for (var i = 0; i < review.rating; i++) const Icon(Icons.star, color: Colors.yellow),
|
||||
for (var i = review.rating; i < 5; i++) const Icon(Icons.star_border),
|
||||
]),
|
||||
const SizedBox(height: 10),
|
||||
Text('Submitted by ' + (_getReviewUser(review)?.username ?? ''), style: const TextStyle(color: Colors.grey, fontSize: 12)),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
color: Colors.white,
|
||||
),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Padding(
|
||||
padding: EdgeInsets.only(top: 3),
|
||||
child: Icon(Icons.rate_review, color: Colors.purple, size: 36),
|
||||
),
|
||||
),
|
||||
]),
|
||||
)),
|
||||
const SizedBox(width: 20),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(review.title, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 24)),
|
||||
Text(review.content),
|
||||
const SizedBox(height: 10),
|
||||
if (review.image != null) Image.network(review.image!.imageUrl, height: 200),
|
||||
if (review.image != null) const SizedBox(height: 15),
|
||||
Row(children: [
|
||||
for (var i = 0; i < review.rating; i++) const Icon(Icons.star, color: Colors.yellow),
|
||||
for (var i = review.rating; i < 5; i++) const Icon(Icons.star_border),
|
||||
]),
|
||||
const SizedBox(height: 10),
|
||||
Text('Submitted by ' + (_getReviewUser(review)?.username ?? ''), style: const TextStyle(color: Colors.grey, fontSize: 12)),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
)).toList(),
|
||||
),
|
||||
)),
|
||||
floatingActionButton: FloatingActionButton(
|
||||
onPressed: () async {
|
||||
if (!await api.isLoggedIn(context)) {
|
||||
|
||||
@ -217,11 +217,9 @@ async fn create_review(auth: AuthorizedUser, data: web::Data<AppData>, input: we
|
||||
place_description: input.place_description.clone(),
|
||||
title: input.title.clone(),
|
||||
content: input.content.clone(),
|
||||
rating: input.rating.clone(),
|
||||
rating: input.rating.clone(),
|
||||
image_id: input.image_id,
|
||||
image: input.image_id.and_then(|image_id| {
|
||||
db.query_row("SELECT * FROM images WHERE id = :id LIMIT 1", &[(":id", &image_id.to_string())], |row| Image::from_row(row)).ok()
|
||||
}),
|
||||
image: None,
|
||||
}),
|
||||
Err(_) => HttpResponse::InternalServerError().finish(),
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user