lokesh/Velar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OHO-24(email testing)

Browse source
This commit is contained in:
lokeshramchand-ctrl 2025-08-28 12:54:32 +05:30
parent 9c79d8a59d
commit d1964c0a10
5 changed files with 245 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Backend/index.js
View file

@ -160,7 +160,7 @@ app.post('/api/transaction/add', async (req, res) => {
const { description, amount, userId } = req.body; const { description, amount, userId } = req.body;
if (!userId) return res.status(400).json({ error: 'Missing userId' }); if (!userId) return res.status(400).json({ error: 'Missing userId' });
const predictRes = await axios.post('http://192.168.1.9:5000/api/predict', { const predictRes = await axios.post('http://10.231.7.150:5000/api/predict', {
description, description,
}); });
const category = predictRes.data.category || 'Other'; const category = predictRes.data.category || 'Other';
@ -233,7 +233,7 @@ app.post('/api/transactions/voice', async (req, res) => {
const description = cleaned || 'misc'; const description = cleaned || 'misc';
// Step 3: Predict category using Flask API // Step 3: Predict category using Flask API
const predictRes = await axios.post('http://192.168.1.9:5000/api/predict', { const predictRes = await axios.post('http://10.231.7.150:5000/api/predict', {
description, description,
}); });
const category = predictRes.data?.category || 'Other'; const category = predictRes.data?.category || 'Other';
@ -439,7 +439,7 @@ app.post('/api/sync-gmail', async (req, res) => {
let category = 'Other'; let category = 'Other';
try { try {
const predictRes = await axios.post('http://192.168.1.9:5000/api/predict', { const predictRes = await axios.post('http://10.231.7.150:5000/api/predict', {
description: parsed.vendor || "Unknown" description: parsed.vendor || "Unknown"
}, { timeout: 5000 }); // Optional timeout }, { timeout: 5000 }); // Optional timeout

6
Frontend/lib/login.dart
View file

@ -110,11 +110,13 @@
// ); // );
// } // }
// } // }
// ignore_for_file: use_build_context_synchronously // ignore_for_file: use_build_context_synchronously, unused_import
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:google_sign_in/google_sign_in.dart'; import 'package:google_sign_in/google_sign_in.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:monarch/main_pages/HomePage/homepage.dart';
import 'package:monarch/main_pages/HomePage/Components/Voice/voice_dialog.dart'; import 'package:monarch/main_pages/HomePage/Components/Voice/voice_dialog.dart';
//import 'package:monarch/email.dart'; //import 'package:monarch/email.dart';
import 'package:monarch/other_pages/enviroment.dart'; import 'package:monarch/other_pages/enviroment.dart';
@ -181,7 +183,7 @@ class _LoginScreenState extends State<LoginScreen> {
Navigator.pushReplacement( Navigator.pushReplacement(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (_) => VoiceTransactionDialog(), builder: (_) => FinTrackHomePage(),
// builder: // builder:
// (_) => EmailsScreen( // (_) => EmailsScreen(
// accessToken: accessToken, // accessToken: accessToken,

316
Frontend/lib/main_pages/HomePage/Components/Email/e_dialog.dart
View file

@ -1,21 +1,99 @@
// ignore_for_file: deprecated_member_use // ignore_for_file: deprecated_member_use, unused_import
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:monarch/other_pages/colors.dart'; import 'package:http/http.dart' as http;
import 'package:monarch/main_pages/HomePage/homepage.dart';
import 'dart:convert';
class EmailTransactionDialog extends StatelessWidget { import 'package:monarch/other_pages/colors.dart';
import 'package:monarch/other_pages/enviroment.dart';
import 'package:shared_preferences/shared_preferences.dart';
class EmailTransactionDialog extends StatefulWidget {
const EmailTransactionDialog({super.key}); const EmailTransactionDialog({super.key});
@override
State<EmailTransactionDialog> createState() => _EmailTransactionDialogState();
}
class _EmailTransactionDialogState extends State<EmailTransactionDialog> {
final List<dynamic> _emails = [];
bool _loading = true;
String? _status;
int _syncedCount = 0;
String? _error;
String? _userId;
String? _accessToken;
@override
@override
void initState() {
super.initState();
_autoSyncEmails();
}
Future<void> _autoSyncEmails() async {
setState(() {
_loading = true;
_status = "Syncing your bank emails...";
_syncedCount = 0;
});
try {
final prefs = await SharedPreferences.getInstance();
final userId = prefs.getString('userId');
final accessToken = prefs.getString('accessToken');
final response = await http.post(
Uri.parse("${Environment.baseUrl}/api/sync-gmail"),
headers: {"Content-Type": "application/json"},
body: jsonEncode({"accessToken": accessToken, "userId": userId}),
);
if (response.statusCode == 200) {
final data = jsonDecode(response.body);
if (data['success'] == true && data['count'] != null) {
setState(() {
_loading = false;
_syncedCount = data['count'];
_status = "✅ Synced $_syncedCount transactions successfully!";
});
// // Optional: navigate back or to another screen after a delay
// Future.delayed(const Duration(seconds: 2), () {
// Navigator.pushReplacement(
// context,
// // MaterialPageRoute(builder: (_) => const FinTrackHomePage()),
// );
// });
} else {
setState(() {
_loading = false;
_status = "❌ Sync failed: Unexpected response format";
});
}
} else {
setState(() {
_loading = false;
_status = "❌ Backend error: ${response.body}";
});
}
} catch (error) {
setState(() {
_loading = false;
_status = "⚠️ Network or unexpected error: $error";
});
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
height: MediaQuery.of(context).size.height * 0.7, height: MediaQuery.of(context).size.height * 0.7,
decoration: BoxDecoration( decoration: BoxDecoration(
color: cardColor, color: cardColor,
borderRadius: const BorderRadius.vertical( borderRadius: const BorderRadius.vertical(top: Radius.circular(28)),
top: Radius.circular(28),
),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withOpacity(0.1), color: Colors.black.withOpacity(0.1),
@ -26,6 +104,7 @@ class EmailTransactionDialog extends StatelessWidget {
), ),
child: Column( child: Column(
children: [ children: [
// Top drag handle
Container( Container(
width: 48, width: 48,
height: 4, height: 4,
@ -35,83 +114,162 @@ class EmailTransactionDialog extends StatelessWidget {
borderRadius: BorderRadius.circular(2), borderRadius: BorderRadius.circular(2),
), ),
), ),
Expanded(
child: Padding( // Header
padding: const EdgeInsets.symmetric(horizontal: 24), Padding(
child: Column( padding: const EdgeInsets.symmetric(horizontal: 24),
crossAxisAlignment: CrossAxisAlignment.start, child: Row(
children: [ children: [
Row( Container(
children: [ width: 48,
Container( height: 48,
width: 48, decoration: BoxDecoration(
height: 48, color: accentColor.withOpacity(0.1),
decoration: BoxDecoration( borderRadius: BorderRadius.circular(12),
color: accentColor.withOpacity(0.1), border: Border.all(
borderRadius: BorderRadius.circular(12), color: accentColor.withOpacity(0.2),
border: Border.all( width: 1,
color: accentColor.withOpacity(0.2),
width: 1,
),
),
child: Icon(
Icons.mail_outline,
color: accentColor,
size: 24,
),
),
const SizedBox(width: 16),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Email Transaction',
style: GoogleFonts.inter(
color: primaryColor,
fontSize: 20,
fontWeight: FontWeight.w700,
),
),
Text(
'Forward receipts to add transactions',
style: GoogleFonts.inter(
color: primaryColor.withOpacity(0.6),
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
],
),
],
),
const SizedBox(height: 32),
Expanded(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.email,
size: 64,
color: accentColor.withOpacity(0.3),
),
const SizedBox(height: 16),
Text(
'Email integration coming soon!',
style: GoogleFonts.inter(
color: primaryColor.withOpacity(0.6),
fontSize: 16,
fontWeight: FontWeight.w500,
),
),
],
),
), ),
), ),
], child: Icon(Icons.mail_outline, color: accentColor, size: 24),
), ),
const SizedBox(width: 16),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Email Transactions',
style: GoogleFonts.inter(
color: primaryColor,
fontSize: 20,
fontWeight: FontWeight.w700,
),
),
Text(
'Forward receipts to auto-add transactions',
style: GoogleFonts.inter(
color: primaryColor.withOpacity(0.6),
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
],
),
const Spacer(),
IconButton(
icon: Icon(Icons.refresh, color: accentColor),
onPressed: _autoSyncEmails,
),
],
), ),
), ),
const SizedBox(height: 16),
// Body (loading / error / empty / list)
Expanded(
child:
_loading
? const Center(child: CircularProgressIndicator())
: _error != null
? Center(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Text(
_error!,
textAlign: TextAlign.center,
style: GoogleFonts.inter(
color: Colors.redAccent,
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
),
)
: _emails.isEmpty
? Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.inbox_outlined,
size: 48,
color: primaryColor.withOpacity(0.4),
),
const SizedBox(height: 12),
Text(
"No transactions found",
style: GoogleFonts.inter(
fontSize: 16,
fontWeight: FontWeight.w600,
color: primaryColor,
),
),
const SizedBox(height: 4),
Text(
"Forward your receipts to see them here.",
style: GoogleFonts.inter(
fontSize: 13,
color: primaryColor.withOpacity(0.6),
),
textAlign: TextAlign.center,
),
],
),
)
: ListView.separated(
padding: const EdgeInsets.symmetric(
horizontal: 20,
vertical: 12,
),
itemCount: _emails.length,
separatorBuilder:
(_, __) => Divider(
height: 1,
color: primaryColor.withOpacity(0.1),
),
itemBuilder: (context, index) {
final email = _emails[index];
return ListTile(
contentPadding: EdgeInsets.zero,
leading: Container(
height: 40,
width: 40,
decoration: BoxDecoration(
color: accentColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
),
child: Icon(
Icons.receipt_long,
color: accentColor,
size: 22,
),
),
title: Text(
email['subject'] ?? "No Subject",
style: GoogleFonts.inter(
fontSize: 15,
fontWeight: FontWeight.w600,
color: primaryColor,
),
overflow: TextOverflow.ellipsis,
),
subtitle: Text(
email['snippet'] ?? "No details available",
style: GoogleFonts.inter(
fontSize: 13,
color: primaryColor.withOpacity(0.6),
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
trailing: Icon(
Icons.chevron_right,
color: primaryColor.withOpacity(0.4),
),
);
},
),
),
], ],
), ),
); );

117
Frontend/lib/main_pages/HomePage/Components/Email/t_dialog.dart
View file

@ -1,117 +0,0 @@
// ignore_for_file: deprecated_member_use
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:monarch/other_pages/colors.dart';
class EmailTransactionDialog extends StatelessWidget {
const EmailTransactionDialog({super.key});
@override
Widget build(BuildContext context) {
return Container(
height: MediaQuery.of(context).size.height * 0.7,
decoration: BoxDecoration(
color: cardColor,
borderRadius: const BorderRadius.vertical(top: Radius.circular(28)),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.1),
blurRadius: 32,
offset: const Offset(0, -8),
),
],
),
child: Column(
children: [
Container(
width: 48,
height: 4,
margin: const EdgeInsets.only(top: 16, bottom: 24),
decoration: BoxDecoration(
color: primaryColor.withOpacity(0.2),
borderRadius: BorderRadius.circular(2),
),
),
Expanded(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Container(
width: 48,
height: 48,
decoration: BoxDecoration(
color: accentColor.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: accentColor.withOpacity(0.2),
width: 1,
),
),
child: Icon(
Icons.mail_outline,
color: accentColor,
size: 24,
),
),
const SizedBox(width: 16),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'Email Transaction',
style: GoogleFonts.inter(
color: primaryColor,
fontSize: 20,
fontWeight: FontWeight.w700,
),
),
Text(
'Forward receipts to add transactions',
style: GoogleFonts.inter(
color: primaryColor.withOpacity(0.6),
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
],
),
],
),
const SizedBox(height: 32),
Expanded(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.email,
size: 64,
color: accentColor.withOpacity(0.3),
),
const SizedBox(height: 16),
Text(
'Email integration coming soon!',
style: GoogleFonts.inter(
color: primaryColor.withOpacity(0.6),
fontSize: 16,
fontWeight: FontWeight.w500,
),
),
],
),
),
),
],
),
),
),
],
),
);
}
}

2
Frontend/lib/main_pages/HomePage/homepage.dart
View file

@ -1,11 +1,11 @@
// ignore_for_file: deprecated_member_use // ignore_for_file: deprecated_member_use
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:monarch/main_pages/HomePage/Components/Email/e_dialog.dart';
import 'package:monarch/main_pages/HomePage/Components/Home/hero_card.dart'; import 'package:monarch/main_pages/HomePage/Components/Home/hero_card.dart';
import 'package:monarch/main_pages/HomePage/animated.dart'; import 'package:monarch/main_pages/HomePage/animated.dart';
import 'package:monarch/main_pages/HomePage/Components/Home/greeting.dart'; import 'package:monarch/main_pages/HomePage/Components/Home/greeting.dart';
import 'package:monarch/main_pages/HomePage/Components/Home/navbar.dart'; import 'package:monarch/main_pages/HomePage/Components/Home/navbar.dart';
import 'package:monarch/main_pages/HomePage/Components/Email/t_dialog.dart';
import 'package:monarch/main_pages/HomePage/Components/Voice/voice_dialog.dart'; import 'package:monarch/main_pages/HomePage/Components/Voice/voice_dialog.dart';
import 'package:monarch/other_pages/colors.dart'; import 'package:monarch/other_pages/colors.dart';
import 'package:monarch/support/fetch_service.dart'; import 'package:monarch/support/fetch_service.dart';