Compare commits

...

9 Commits

Author SHA1 Message Date
a34ca6512e got back the functionality of switching between folders 2024-10-21 02:09:56 -04:00
83592472d4 fixed it 2024-10-21 01:00:47 -04:00
f77ebe0a09 removed some unnecessary code 2024-10-21 00:59:49 -04:00
afcb58b152 make the folder drawer a widget by itself 2024-10-20 03:18:40 -04:00
d29650a7d0 isolating data structures 2024-10-20 03:18:02 -04:00
bfc1232c06 isolating email contents generation 2024-10-20 03:17:50 -04:00
1792f98824 isolating only api calls 2024-10-20 03:17:24 -04:00
0d07aee02a sidebar stuff 2024-10-20 00:30:24 -04:00
85decfa0f8 trying to move to an actual drawer 2024-10-20 00:29:57 -04:00
6 changed files with 366 additions and 513 deletions

View File

@ -1,3 +1,6 @@
// this file should handle most of the API calls
// it also builds some widgets, but it will be modulated later
import 'package:crab_ui/structs.dart'; import 'package:crab_ui/structs.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;
@ -6,48 +9,25 @@ import 'dart:ui_web' as ui;
import 'augment.dart'; import 'augment.dart';
import 'dart:html' as html; import 'dart:html' as html;
//data structure
class MailAddress {
final String? name;
final String address;
MailAddress({this.name, required this.address});
factory MailAddress.fromJson(Map<String, dynamic> json) { class ApiService {
return MailAddress( // List emails = [];
name: json['name'],
address: json['address'],
);
}
@override
String toString() {
// TODO: implement toString
return '${name} <${address}>';
}
}
class EmailPage extends StatefulWidget {
const EmailPage({super.key});
final String title = 'Emails';
@override
State<EmailPage> createState() => EmailPageState();
}
class EmailPageState extends State<EmailPage> {
List emails = [];
void _displayEmailsFromFolder(String folder) async {
List<GetThreadResponse> allEmails = []; //all the emails
Future<List<GetThreadResponse>> fetchEmailsFromFolder(
String folder, int pagenitaion) async {
try { try {
var url = Uri.http('127.0.0.1:3001', 'sorted_threads_by_date', var url = Uri.http('127.0.0.1:3001', 'sorted_threads_by_date', {
{'folder': folder, 'limit': '10', 'offset': '0'}); 'folder': folder,
'limit': '20',
'offset': pagenitaion.toString(),
});
var response = await http.get(url); var response = await http.get(url);
print(response); // print(response);
List<GetThreadResponse> allEmails = [];
if (response.statusCode == 200) { if (response.statusCode == 200) {
List json = jsonDecode(response.body); List json = jsonDecode(response.body);
for (var item in json.take(1)) { for (var item in json) {
//each item in the json is a date //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]);
@ -56,21 +36,25 @@ class EmailPageState extends State<EmailPage> {
} }
} }
} }
return allEmails;
} else { } else {
throw Exception('Failed to load threads'); throw Exception('Failed to load threads');
} }
} catch (e) { } catch (e) {
print('_displayEmailsFromFolder caught error: $e'); print('_displayEmailsFromFolder caught error: $e');
return [];
} }
print("Done"); print("Done");
setState(() { // setState(() {
emails = allEmails; // emails = allEmails;
}); // });
} }
Future<void> fetchThreads( Future<void> fetchThreads(
int threadId, List<GetThreadResponse> allEmails) async { //populates allEmails, which is the List that contains all the emails in a thread
int threadId,
List<GetThreadResponse> allEmails) async {
try { try {
var url = var url =
Uri.http('127.0.0.1:3001', 'get_thread', {'id': threadId.toString()}); Uri.http('127.0.0.1:3001', 'get_thread', {'id': threadId.toString()});
@ -91,7 +75,7 @@ class EmailPageState extends State<EmailPage> {
} }
} }
Future<String> _getEmailContent(List<String> IDs) async { Future<String> fetchEmailContent(List<String> IDs) async {
String content = r""" String content = r"""
"""; """;
@ -104,7 +88,7 @@ class EmailPageState extends State<EmailPage> {
if (response.statusCode == 200) { if (response.statusCode == 200) {
content += response.body; content += response.body;
content += "<p>end of mail</p><br><br><br>"; content += "<p>end of mail</p><br><br><br><hr>";
} }
} }
} catch (e) { } catch (e) {
@ -113,136 +97,20 @@ class EmailPageState extends State<EmailPage> {
return content; return content;
} }
Future<List<Widget>> getDrawerItems(BuildContext context) async { // void _addMailBox async(BuildContext context){
List<String> drawerItems = []; // //add email folder
// showDialog(context: context, builder: builder)
// }
Future<List<String>> fetchFolders() async {
try { try {
var url = Uri.http('127.0.0.1:3001', 'folders'); var url = Uri.http('127.0.0.1:3001', 'folders');
var response = await http.get(url); var response = await http.get(url);
drawerItems = List<String>.from(json.decode(response.body)); return List<String>.from(json.decode(response.body));
} catch (e) { } catch (e) {
print('getDrawerItems caught error: $e'); print('fetchFolders caught error: $e');
return [];
} }
List<Widget> drawerWidgets = [];
for (String item in drawerItems) {
drawerWidgets.add(
ListTile(
leading: Icon(Icons.mail),
title: Text(item),
onTap: () {
_displayEmailsFromFolder(item);
Navigator.pop(context);
},
),
);
}
return drawerWidgets;
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Theme.of(context).colorScheme.inversePrimary,
title: Text(widget.title),
),
drawer: Drawer(
child: FutureBuilder<List<Widget>>(
future: getDrawerItems(
context), // call the async function to get the future
builder:
(BuildContext context, AsyncSnapshot<List<Widget>> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
// While data is loading, show a progress indicator
return Center(child: CircularProgressIndicator());
} else if (snapshot.hasError) {
// If something went wrong, show an error message
return Center(child: Text('Error: ${snapshot.error}'));
} else {
// When data is fetched successfully, display the items
return ListView(
padding: EdgeInsets.zero,
children:
snapshot.data!, // Unwrap the data once confirmed it's there
);
}
},
),
),
body: EmailListScreen(
emails: emails,
getEmailContent: _getEmailContent,
// getJsonEmail: _getThreadMessagesJson
),
);
}
}
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 Future<String> Function(List<String>) getEmailContent;
EmailListScreen({
required this.emails,
required this.getEmailContent,
});
// instead of getting the entire email, just the from, text, subject, and id
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('Emails'),
),
body: ListView.separated(
itemCount: emails.length,
itemBuilder: (context, index) {
return ListTile(
title: Text(emails[index].from_name,
style: TextStyle(fontWeight: FontWeight.bold)),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(emails[index].subject),
],
),
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 {
String emailContent =
await getEmailContent(emails[index].messages);
String fromName = emails[index].from_name.toString();
String fromAddress = emails[index].from_address.toString();
String to = emails[index].to.toString();
String subject = emails[index].subject.toString();
String date = emails[index].date.toString();
String id = emails[index].id.toString();
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => EmailView(
emailContent: emailContent,
from: fromAddress,
name: fromName,
to: to,
subject: subject,
date: date,
id: id,
)),
);
});
},
separatorBuilder: (context, index) {
return Divider();
},
),
);
} }
} }

View File

@ -1,228 +1,94 @@
// import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
// import 'package:http/http.dart' as http; import 'api_service.dart';
// import 'dart:convert'; import 'structs.dart';
// import 'dart:ui_web' as ui;
// import 'dart:html' as html;
// // import 'package:flutter_html/flutter_html.dart'; class EmailListScreen extends StatelessWidget {
final List<GetThreadResponse> emails;
final Future<String> Function(List<String>) getEmailContent;
// class SerializableMessage { EmailListScreen({required this.emails, required this.getEmailContent});
// final String name;
// final String from;
// final String path;
// final String subject;
// final String date;
// SerializableMessage( @override
// {required this.name, Widget build(BuildContext context) {
// required this.from, return Scaffold(
// required this.path, body: ListView.separated(
// required this.subject, itemCount: emails.length,
// required this.date}); itemBuilder: (context, index) {
final email = emails[index];
return ListTile(
title: Text(email.from_name,
style: TextStyle(fontWeight: FontWeight.bold)),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [Text(email.subject)],
),
trailing: Text(email.date.toString()),
onTap: () async {
String emailContent = await getEmailContent(email.messages);
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => EmailView(
emailContent: emailContent,
from: email.from_address,
name: email.from_name,
to: email.to.toString(),
subject: email.subject,
date: email.date.toString(),
id: email.id.toString(),
),
),
);
},
);
},
separatorBuilder: (context, index) => Divider(),
),
);
}
}
// factory SerializableMessage.fromJson(Map<String, dynamic> json) { class EmailPage extends StatefulWidget {
// return SerializableMessage( EmailPage({Key? key}) : super(key: key);
// name: json['name'], String selectedFolder = "INBOX";
// from: json['from'],
// path: json['path'], @override
// subject: json['subject'], EmailPageState createState() => EmailPageState();
// date: json['date']); }
// }
// }
// class EmailPage extends StatefulWidget { class EmailPageState extends State<EmailPage> {
// const EmailPage({super.key}); final ApiService apiService = ApiService();
// final String title = 'cars'; List<GetThreadResponse> emails = [];
// @override void updateSelectedFolder(String folder) {
// State<EmailPage> createState() => _EmailPageState(); setState(() {
// } widget.selectedFolder = folder;
});
print(folder);
_fetchEmails();
}
// class _EmailPageState extends State<EmailPage> { void _fetchEmails() async {
// List emails = []; // print(selectedFolder)
// // @override try {
// // void initState() { List<GetThreadResponse> fetchedEmails =
// // super.initState(); await apiService.fetchEmailsFromFolder(widget.selectedFolder, 0);
// // } setState(() {
// //register the html element emails = fetchedEmails; // Update the list of emails
// ui.platformViewRegistry.registerViewFactory( });
// 'html-view', } catch (e) {
// (int viewId) => html.IFrameElement() print('Error fetching emails: $e');
// ..width = '100%' }
// ..height = '100%' }
// ..srcdoc = r"""
// """
// ..style.border = 'none',
// );
// void _displayEmailsFromFolder(String folder) async {
// Map<String, List<SerializableMessage>> messagesMap = {};
// try { @override
// var url = Uri.http( Widget build(BuildContext context) {
// '127.0.0.1:3001', 'sorted_threads_by_date', {'folder': folder}); _fetchEmails();
// var response = await http.get(url); return Scaffold(
body: EmailListScreen(
// Map<String, dynamic> json = jsonDecode(response.body); emails: emails,
getEmailContent: apiService.fetchEmailContent,
// json.forEach((key, value) { ),
// List<SerializableMessage> messages = (value as List) );
// .map((item) => SerializableMessage.fromJson(item)) }
// .toList(); }
// messagesMap[key] = messages;
// });
// } catch (e) {
// print('_displayEmailsFromFolder caught error: $e');
// }
// setState(() {
// emails.clear();
// emails = messagesMap.values.toList().expand((list) => list).toList();
// ;
// });
// }
// Future<List<Widget>> _getDrawerItems() async {
// List<String> drawerItems = [];
// try {
// var url = Uri.http('127.0.0.1:3001', 'folders');
// var response = await http.get(url);
// drawerItems = List<String>.from(json.decode(response.body));
// } catch (e) {
// print('_getDrawerItems caught error: $e');
// }
// List<Widget> drawerWidgets = [];
// for (String item in drawerItems) {
// drawerWidgets.add(
// ListTile(
// leading: Icon(Icons.mail),
// title: Text(item),
// onTap: () {
// _displayEmailsFromFolder(item);
// Navigator.pop(context);
// },
// ),
// );
// }
// return drawerWidgets;
// }
// @override
// Widget build(BuildContext context) {
// return Scaffold(
// appBar: AppBar(
// backgroundColor: Theme.of(context).colorScheme.inversePrimary,
// title: Text(widget.title),
// ),
// drawer: Drawer(
// child: FutureBuilder<List<Widget>>(
// future:
// _getDrawerItems(), // call the async function to get the future
// builder:
// (BuildContext context, AsyncSnapshot<List<Widget>> snapshot) {
// if (snapshot.connectionState == ConnectionState.waiting) {
// // While data is loading, show a progress indicator
// return Center(child: CircularProgressIndicator());
// } else if (snapshot.hasError) {
// // If something went wrong, show an error message
// return Center(child: Text('Error: ${snapshot.error}'));
// } else {
// // When data is fetched successfully, display the items
// return ListView(
// padding: EdgeInsets.zero,
// children:
// snapshot.data!, // Unwrap the data once confirmed it's there
// );
// }
// },
// ),
// ),
// body: EmailListScreen(
// emails: emails,
// ),
// );
// }
// }
// class EmailListScreen extends StatelessWidget {
// List emails;
// EmailListScreen({required this.emails});
// @override
// Widget build(BuildContext context) {
// print(emails);
// return Scaffold(
// appBar: AppBar(
// title: Text('Emails'),
// ),
// body: ListView.separated(
// itemCount: emails.length,
// itemBuilder: (context, index) {
// return ListTile(
// title: Text(emails[index].from,
// style: TextStyle(fontWeight: FontWeight.bold)),
// subtitle: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Text(emails[index].subject),
// ],
// ),
// trailing: Text(emails[index].date.toString()),
// onTap: () {
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (context) => EmailView(emailContent: "")),
// );
// });
// },
// separatorBuilder: (context, index) {
// return Divider();
// },
// ),
// );
// }
// }
// class HtmlContentWidget extends StatelessWidget {
// @override
// Widget build(BuildContext context) {
// return Container(
// width: 800,
// height: 10000,
// child: HtmlElementView(viewType: 'html-view'),
// );
// }
// }
// class EmailView extends StatelessWidget {
// final String emailContent;
// EmailView({required this.emailContent});
// @override
// Widget build(BuildContext context) {
// return Scaffold(
// appBar: AppBar(
// title: Text("HTML Content"),
// ),
// body: Container(
// width: 800,
// height: 10000,
// child: HtmlElementView(
// viewType: 'html-view',
// ),
// )
// // Text(
// // """
// // <h1>Heading</h1>
// // <p>This is a <strong>simple</strong> HTML example.</p>
// // """,
// // ),
// );
// }r
// }

65
lib/folder_drawer.dart Normal file
View File

@ -0,0 +1,65 @@
//drawer with the folders for emails a.k.a mailboxes
import 'package:flutter/material.dart';
import 'api_service.dart';
class FolderDrawer extends StatefulWidget {
ApiService apiService;
Function(String) onFolderTap;
FolderDrawer({required this.apiService, required this.onFolderTap});
@override
_FolderDrawerState createState() => _FolderDrawerState();
}
class _FolderDrawerState extends State<FolderDrawer> {
List<String> folders = [];
@override
void initState() {
super.initState();
_fetchFolders();
}
Future<void> _fetchFolders() async {
try {
List<String> fetchedFolders = await widget.apiService.fetchFolders();
setState(() {
folders = fetchedFolders;
});
} catch (e) {
print('Error fetching folders: $e');
}
}
@override
Widget build(BuildContext context) {
return Drawer(
child: ListView(
padding: EdgeInsets.zero,
children: [
...folders.map((folder) {
return ListTile(
leading: Icon(Icons.mail),
title: Text(folder),
onTap: () {
widget.onFolderTap(folder);
Navigator.pop(
context); // Close the drawer after selecting a folder
},
);
}).toList(),
ListTile(
leading: Icon(Icons.refresh),
title: Text('Refresh Folders'),
onTap: () {
_fetchFolders(); // Refresh folders when this tile is tapped
Navigator.pop(context); // Close the drawer after refresh
},
),
],
),
);
}
}

View File

@ -1,151 +1,185 @@
// import 'package:crab_ui/email.dart'; import 'package:crab_ui/folder_drawer.dart';
import 'package:flutter/widgets.dart';
import 'api_service.dart'; import 'api_service.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'email.dart'; import 'email.dart';
import 'api_service.dart';
import 'dart:html' as html;
import 'dart:ui_web' as ui;
class HomeScreen extends StatefulWidget { class HomeScreen extends StatefulWidget {
@override @override
_HomeScreenState createState() => _HomeScreenState(); _HomeScreenState createState() => _HomeScreenState();
} }
class _HomeScreenState extends State<HomeScreen> { class _HomeScreenState extends State<HomeScreen> {
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
final GlobalKey<EmailPageState> _emailPageKey = GlobalKey<EmailPageState>();
ApiService apiService = ApiService();
bool _isSidebarOpen = true;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
} }
bool _isSidebarOpen = true;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: Stack( key: _scaffoldKey,
children: [ drawer: FolderDrawer(
Row( apiService: apiService,
children: [ onFolderTap: (folder) {
// Sidebar _emailPageKey.currentState?.updateSelectedFolder(folder);
if (_isSidebarOpen) },
Container( ),
width: 70, body: Stack(
color: Color.fromARGB(17, 96, 122, 135), children: [
child: Column( Row(
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ // Sidebar
ListTile( if (_isSidebarOpen)
leading: Icon(Icons.home), Container(
onTap: () { width: 70,
// Navigate to Home color: Color.fromARGB(17, 96, 122, 135),
}, child: Column(
), crossAxisAlignment: CrossAxisAlignment.start,
ListTile( children: [
leading: Icon(Icons.settings), ListTile(
onTap: () { leading: Icon(Icons.home),
// Navigate to Settings onTap: () {
}, // Navigate to Home
), },
ListTile( ),
leading: Icon(Icons.email), ListTile(
onTap: () { leading: Icon(Icons.settings),
Navigator.push( onTap: () {
context, // Navigate to Settings
MaterialPageRoute( },
builder: (context) => EmailPage()), ),
); ListTile(
}, leading: Icon(Icons.email),
), onTap: () {
Spacer(), _scaffoldKey.currentState?.openDrawer();
Padding( },
padding: const EdgeInsets.all(8.0), ),
child: Align( Spacer(),
alignment: Alignment.bottomLeft, Padding(
child: IconButton( padding: const EdgeInsets.all(8.0),
icon: Icon(Icons.close, color: Colors.white), child: Align(
onPressed: () { alignment: Alignment.bottomLeft,
setState(() { child: IconButton(
_isSidebarOpen = false; icon: Icon(Icons.close, color: Colors.white),
}); onPressed: () {
}, setState(() {
), _isSidebarOpen = false;
});
},
), ),
), ),
],
),
),
// Main content
Expanded(
child: Column(
children: [
Container(
padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 4.0),
color: Color.fromARGB(42, 36, 102, 132),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: 800,
height: 40,
child: TextField(
decoration: InputDecoration(
hintText: 'Search...',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.search),
),
),
),
],
),
), ),
Container(
padding: EdgeInsets.all(0.0),
color: Color.fromARGB(42, 36, 102, 132),
child: Row(
children: [
Container(
height: 2,
)
],
),
),
Container(
padding: EdgeInsets.all(8.0),
color: Colors.white,
child: Row(
children: [
Container(
child: Text('hiiiiiii'),
),
],
),
),
// Expanded(
// child: Center(
// child: EmailPage(),
// ),
// )
], ],
), ),
), ),
], // Main content
), Expanded(
if (!_isSidebarOpen) child: Column(
Positioned( children: [
bottom: 16, Container(
left: 16, padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 4.0),
child: FloatingActionButton( color: Color.fromARGB(42, 36, 102, 132),
child: Icon(Icons.menu), child: Row(
onPressed: () { mainAxisAlignment: MainAxisAlignment.center,
setState(() { children: [
_isSidebarOpen = true; Container(
}); width: 800,
}, height: 40,
child: TextField(
decoration: InputDecoration(
hintText: 'Search...',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.search),
),
),
),
],
),
),
Container(
padding: EdgeInsets.all(0.0),
color: Color.fromARGB(42, 36, 102, 132),
child: Row(
children: [
Container(
height: 2,
)
],
),
),
Container(
padding: EdgeInsets.all(8.0),
color: Colors.white,
child: Row(
children: [
Container(
child: Text('hiiiiiii'),
),
],
),
),
Expanded(
child: EmailPage(key: _emailPageKey),
)
],
), ),
), ),
], ],
), ),
); if (!_isSidebarOpen)
} Positioned(
bottom: 16,
left: 16,
child: FloatingActionButton(
child: Icon(Icons.menu),
onPressed: () {
setState(() {
_isSidebarOpen = true;
});
},
),
),
],
),
);
} }
void _showPopupMenu(BuildContext context, Offset position) async {
final RenderBox overlay =
Overlay.of(context).context.findRenderObject() as RenderBox;
await showMenu<String>(
context: context,
position: RelativeRect.fromLTRB(
position.dx,
position.dy,
overlay.size.width - position.dx,
overlay.size.height - position.dy,
),
items: <PopupMenuEntry<String>>[
PopupMenuItem<String>(
value: 'Open',
child: Text('Open'),
),
PopupMenuItem<String>(
value: 'Reply',
child: Text('Reply'),
),
PopupMenuItem<String>(
value: 'Delete',
child: Text('Delete'),
),
],
);
}
}
//show popup menu

View File

@ -1,8 +1,9 @@
import 'package:crab_ui/contact.dart'; import 'package:crab_ui/contact.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'home_page.dart'; import 'home_page.dart';
import 'api_service.dart'; // import 'api_service.dart';
import 'login.dart'; import 'login.dart';
import 'email.dart';
void main() { void main() {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
@ -25,7 +26,7 @@ class HyM extends StatelessWidget {
routes: { routes: {
"/login": (context) => const LoginPage(), "/login": (context) => const LoginPage(),
"/email": (context) => EmailPage(), // "/email": (context) => EmailPage(),
"/contacts": (context) => ContactsPage(), "/contacts": (context) => ContactsPage(),
}, },
); );

View File

@ -1,3 +1,5 @@
//data structures
import 'api_service.dart'; import 'api_service.dart';
@ -34,7 +36,24 @@ class GetThreadResponse {
} }
} }
class MailAddress {
final String? name;
final String address;
MailAddress({this.name, required this.address});
factory MailAddress.fromJson(Map<String, dynamic> json) {
return MailAddress(
name: json['name'],
address: json['address'],
);
}
@override
String toString() {
// TODO: implement toString
return '${name} <${address}>';
}
}
// //old data structure // //old data structure
// class SerializableMessage { // class SerializableMessage {
// final String name; // final String name;