Juan/hym_ui
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

major refactor because of new endpoint supposed to bring runtime significantly (broke the opening of emails)

Browse Source
This commit is contained in:
Juan Marulanda De Los Rios 2024-09-20 00:36:54 -04:00
parent 42e31f63c5
commit 9645db2fbe
1 changed files with 162 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
lib/api_service.dart
View File

@ -1,3 +1,5 @@
import 'package:crab_ui/structs.dart';
import 'package:english_words/english_words.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'dart:convert'; import 'dart:convert';
@ -26,57 +28,56 @@ class MailAddress {
} }
} }
//data structure // //data structure
class SerializableMessage { // class SerializableMessage {
final String name; // final String name;
final String from; // final String from;
final List<MailAddress> to; // final List<MailAddress> to;
final List<MailAddress> cc; // final List<MailAddress> cc;
final String hash; // final String hash;
// final String path; // final String subject;
final String subject; // final String date;
final String date; // final int uid;
final int uid; // final String list;
final String list; // final String id;
final String id; // final String in_reply_to;
final String in_reply_to;
SerializableMessage({ // SerializableMessage({
required this.name, // required this.name,
required this.from, // required this.from,
required this.to, // required this.to,
required this.cc, // required this.cc,
required this.hash, // required this.hash,
required this.subject, // required this.subject,
required this.date, // required this.date,
required this.uid, // required this.uid,
required this.list, // required this.list,
required this.id, // required this.id,
required this.in_reply_to, // required this.in_reply_to,
}); // });
factory SerializableMessage.fromJson(Map<String, dynamic> json) { // factory SerializableMessage.fromJson(Map<String, dynamic> json) {
var toList = json['to'] as List; // var toList = json['to'] as List;
var ccList = json['cc'] as List; // var ccList = json['cc'] as List;
return SerializableMessage( // return SerializableMessage(
name: json['name'], // name: json['name'],
from: json['from'], // from: json['from'],
// to: json['name', 'address'] // // to: json['name', 'address']
to: toList.map((i) => MailAddress.fromJson(i)).toList(), // to: toList.map((i) => MailAddress.fromJson(i)).toList(),
cc: ccList.map((i) => MailAddress.fromJson(i)).toList(), // cc: ccList.map((i) => MailAddress.fromJson(i)).toList(),
// path: json['path'], // // path: json['path'],
hash: json['hash'], // hash: json['hash'],
subject: json['subject'], // subject: json['subject'],
date: json['date'], // date: json['date'],
uid: json['uid'], // uid: json['uid'],
list: json['list'], // list: json['list'],
id: json['id'], // id: json['id'],
in_reply_to: json['in_reply_to'], // in_reply_to: json['in_reply_to'],
); // );
} // }
} // }
class EmailPage extends StatefulWidget { class EmailPage extends StatefulWidget {
const EmailPage({super.key}); const EmailPage({super.key});
@ -91,31 +92,23 @@ class _EmailPageState extends State<EmailPage> {
void _displayEmailsFromFolder(String folder) async { void _displayEmailsFromFolder(String folder) async {
// Map<String, List<SerializableMessage>> messagesMap = {}; // Map<String, List<SerializableMessage>> messagesMap = {};
List<SerializableMessage> allEmails = []; List<GetThreadResponse> allEmails = []; //all the emails
try { try {
var url = Uri.http( var url = Uri.http(
'127.0.0.1:3001', 'sorted_threads_by_date', {'folder': folder}); '127.0.0.1:3001', 'sorted_threads_by_date', {'folder': folder});
var response = await http.get(url); var response = await http.get(url);
print(response.body);
// Map<String, dynamic> json = jsonDecode(response.body); original
// json.forEach((key, value) {
// List<SerializableMessage> messages = (value as List)
// .map((item) => SerializableMessage.fromJson(item))
// .toList();
// messagesMap[key] = messages;
// });
// new shit
if (response.statusCode == 200) { if (response.statusCode == 200) {
List<dynamic> json = jsonDecode(response.body); List json = jsonDecode(response.body);
for (var item in json.take(1)) { //each item in the json is a date for (var item in json.take(1)) {
//each item in the json is a date
if (item.length > 1 && item[0] is String && item[1] is List) { if (item.length > 1 && item[0] is String && item[1] is List) {
List<int> threadIDs = List<int>.from(item[1]); List<int> threadIDs = List<int>.from(item[1]);
for (var threadId in threadIDs) { for (var threadId in threadIDs) {
print(threadId); // print(threadId);
await fetchThreadMessages(threadId, allEmails); // await fetchThreadMessages(threadId, allEmails);
await fetchThreads(threadId, allEmails);
} }
//TODO: get exact thread with new api endpoint from chosen thread? //TODO: get exact thread with new api endpoint from chosen thread?
} }
@ -127,30 +120,43 @@ class _EmailPageState extends State<EmailPage> {
print('_displayEmailsFromFolder caught error: $e'); print('_displayEmailsFromFolder caught error: $e');
} }
print("Done"); print("Done");
setState(() { setState(() {
emails.clear(); emails = allEmails;
// emails = messagesMap.values.toList().expand((list) => list).toList();
emails.addAll(allEmails);
;
}); });
print(emails[0]);
// Print allEmails to debug its structure
print("allEmails: ${allEmails[0].messages}");
// Convert allEmails to a list
} }
// }
// Future<void> fetchThreads(AboutDialog){ Future<void> fetchThreads(
// } //complete
int threadId,
Future<void> fetchThreadMessages( List<GetThreadResponse> allEmails) async {
int threadId, List<SerializableMessage> allEmails) async {
try { try {
var url = Uri.http( var url =
'127.0.0.1:3001', 'get_thread_messages', {'id': threadId.toString()}); Uri.http('127.0.0.1:3001', 'get_thread', {'id': threadId.toString()});
var response = await http.get(url); var response = await http.get(url);
// print(response.body);
if (response.statusCode == 200) { if (response.statusCode == 200) {
List<dynamic> messagesJson = jsonDecode(response.body); Map<String, dynamic> messagesJson = jsonDecode(response.body);
List<SerializableMessage> messages = // print(messagesJson);
messagesJson.map((mj) => SerializableMessage.fromJson(mj)).toList(); // List<String> messagesofThread = messagesJson['messages'];
allEmails.addAll(messages); // messagesJson.map((mj) => GetThreadResponse.fromJson(mj)).toList();
// List<GetThreadResponse> messages = messagesJson.values.map((mj) {
// return GetThreadResponse.fromJson(mj as Map<String, dynamic>);
// }).toList();
// List<GetThreadResponse> thread =
// messagesJson.map((mj) => GetThreadResponse.fromJson(mj)).toList();
GetThreadResponse threadResponse =
GetThreadResponse.fromJson(messagesJson);
allEmails.add(
threadResponse); //adds all the messages of the thread into all emails
//perhaps should change
} else { } else {
throw Exception( throw Exception(
'Failed to fetch thread messages for thread ID: $threadId'); 'Failed to fetch thread messages for thread ID: $threadId');
@ -160,6 +166,28 @@ class _EmailPageState extends State<EmailPage> {
} }
} }
// Future<void> fetchThreadMessages(
// int threadId, List<SerializableMessage> allEmails) async {
// try {
// var url = Uri.http(
// '127.0.0.1:3001', 'get_thread_messages', {'id': threadId.toString()});
// var response = await http.get(url);
// if (response.statusCode == 200) {
// List<dynamic> messagesJson = jsonDecode(response.body);
// List<SerializableMessage> messages =
// messagesJson.map((mj) => SerializableMessage.fromJson(mj)).toList();
// allEmails.addAll(messages);
// } else {
// throw Exception(
// 'Failed to fetch thread messages for thread ID: $threadId');
// }
// } catch (e) {
// print('Error fetching thread messages: $e');
// }
// }
Future<String> _getEmailContent(String id) async { Future<String> _getEmailContent(String id) async {
String content = r""" String content = r"""
@ -249,6 +277,8 @@ class _EmailPageState extends State<EmailPage> {
} }
class EmailListScreen extends StatelessWidget { class EmailListScreen extends StatelessWidget {
//this is the bulding of the drawer with all emails
// try to only get the subject and id, date, sender to make it faster
final List emails; final List emails;
final Future<String> Function(String) getEmailContent; final Future<String> Function(String) getEmailContent;
@ -256,7 +286,7 @@ class EmailListScreen extends StatelessWidget {
required this.emails, required this.emails,
required this.getEmailContent, required this.getEmailContent,
}); });
// instead of getting the entire email, just the from, text, subject, and id
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -267,7 +297,7 @@ class EmailListScreen extends StatelessWidget {
itemCount: emails.length, itemCount: emails.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
return ListTile( return ListTile(
title: Text(emails[index].from, title: Text(emails[index].from_name,
style: TextStyle(fontWeight: FontWeight.bold)), style: TextStyle(fontWeight: FontWeight.bold)),
subtitle: Column( subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -276,31 +306,42 @@ class EmailListScreen extends StatelessWidget {
], ],
), ),
trailing: Text(emails[index].date.toString()), trailing: Text(emails[index].date.toString()),
//here we assign each part of json to a var, this could be changed so it only happens,
// when clicking on email for modularity
onTap: () async { onTap: () async {
String emailContent = await getEmailContent(emails[index].id); String emailContent = await getEmailContent(emails[index].id);
String from = emails[index].from.toString(); String messages = emails[index].messages.toString();
String name = emails[index].name.toString(); String fromName = emails[index].from_name.toString();
String fromAddress = emails[index].from_address.toString();
String to = emails[index].to.toString(); String to = emails[index].to.toString();
String cc = emails[index].cc.toString(); // String cc = emails[index].cc.toString();
String hash = emails[index].hash.toString(); // String hash = emails[index].hash.toString();
String subject = emails[index].subject.toString(); String subject = emails[index].subject.toString();
String date = emails[index].date.toString(); String date = emails[index].date.toString();
String uid = emails[index].uid.toString(); // String uid = emails[index].uid.toString();
String list = emails[index].list.toString(); // String list = emails[index].list.toString();
String id = emails[index].id.toString(); String id = emails[index].id.toString();
String in_reply_to = emails[index].in_reply_to.toString(); // String in_reply_to = emails[index].in_reply_to.toString();
// String jsonbuilt =
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => EmailView( builder: (context) => EmailView(
emailContent: emailContent, emailContent: emailContent,
// jsonEmail: jsonContent, from: fromAddress,
from: from, name: name, to: to, cc: cc, hash: hash, name: fromName,
subject: subject, date: date, to: to,
uid: uid, list: list, id: id, // cc: cc,
in_reply_to: in_reply_to, // hash: hash,
)), subject: subject,
date: date,
// uid: uid,
// list: list,
id: id,
// in_reply_to: in_reply_to,
)
//nada hpta
),
); );
}); });
}, },
@ -317,32 +358,37 @@ class EmailView extends StatefulWidget {
// final String jsonEmail; // final String jsonEmail;
final String from; final String from;
final String name; final String name;
final String to; final String to;
final String cc;
final String hash; // final String to;
// final String cc;
// final String hash;
final String subject; final String subject;
final String date; final String date;
final String uid; // final String uid;
final String list; // final String list;
final String id; final String id;
final String in_reply_to; // final String in_reply_to;
const EmailView( const EmailView({
{Key? key, Key? key,
required this.emailContent, required this.emailContent,
// required this.jsonEmail, // required this.jsonEmail,
required this.from, required this.from,
required this.name, required this.name,
required this.to, required this.to,
required this.cc,
required this.hash, // required this.to,
required this.subject, // required this.cc,
required this.date, // required this.hash,
required this.uid, required this.subject,
required this.list, required this.date,
required this.id, // required this.uid,
required this.in_reply_to}) // required this.list,
: super(key: key); required this.id,
// required this.in_reply_to
}) : super(key: key);
@override @override
_EmailViewState createState() => _EmailViewState(); _EmailViewState createState() => _EmailViewState();
} }