ABOUT TO END

Backend/index.js

@@ -1,4 +1,4 @@
-require('dotenv').config(); // Add this at the very top
+require('dotenv').config(); 
 const express = require('express');
 const mongoose = require('mongoose');
 const axios = require('axios');

Frontend/monarch/lib/main.dart

@@ -5,10 +5,10 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:http/http.dart' as http;
-import 'package:monarch/add.dart';
-import 'package:monarch/update_budget.dart';
-import 'package:monarch/homepage.dart';
-import 'package:monarch/statistics.dart';
+import 'package:monarch/support/add.dart';
+import 'package:monarch/main_pages/Statistics/update_budget.dart';
+import 'package:monarch/main_pages/HomePage/homepage.dart';
+import 'package:monarch/main_pages/Statistics/statistics.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();

Frontend/monarch/lib/main_pages/HomePage/hero_card.dart

@@ -2,7 +2,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/colors.dart';
+import 'package:monarch/other_pages/colors.dart';
   final double totalBalance = 5847.32;
   final double monthlyIncome = 8500.00;
   final double monthlyExpenses = 2652.68;

Frontend/monarch/lib/main_pages/HomePage/homepage.dart

@@ -3,12 +3,12 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/colors.dart';
-import 'package:monarch/fetch_service.dart';
-import 'package:monarch/hero_card.dart';
-import 'package:monarch/navbar.dart';
-import 'package:monarch/quick_actions.dart';
-import 'package:monarch/transcations_recent.dart';
+import 'package:monarch/other_pages/colors.dart';
+import 'package:monarch/support/fetch_service.dart';
+import 'package:monarch/main_pages/HomePage/hero_card.dart';
+import 'package:monarch/main_pages/HomePage/navbar.dart';
+import 'package:monarch/main_pages/HomePage/quick_actions.dart';
+import 'package:monarch/support/transcations_recent.dart';
 //import 'package:monarch/static.dart';
 
 class FinTrackHomePage extends StatefulWidget {

Frontend/monarch/lib/main_pages/HomePage/navbar.dart

@@ -1,9 +1,9 @@
 // ignore_for_file: deprecated_member_use
 
 import 'package:flutter/material.dart';
-import 'package:monarch/add.dart';
-import 'package:monarch/homepage.dart';
-import 'package:monarch/statistics.dart';
+import 'package:monarch/support/add.dart';
+import 'package:monarch/main_pages/HomePage/homepage.dart';
+import 'package:monarch/main_pages/Statistics/statistics.dart';
 
 class CustomNavBar extends StatelessWidget {
   final int currentIndex;

Frontend/monarch/lib/main_pages/HomePage/quick_actions.dart

@@ -3,8 +3,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/add.dart';
-import 'package:monarch/colors.dart';
+import 'package:monarch/support/add.dart';
+import 'package:monarch/other_pages/colors.dart';
 
 class QuickActionsPage extends StatelessWidget {
   const QuickActionsPage({super.key});

Frontend/monarch/lib/main_pages/Statistics/statistics.dart

@@ -7,12 +7,12 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:http/http.dart' as http;
-import 'package:monarch/add.dart';
-import 'package:monarch/enviroment.dart';
-import 'package:monarch/update_budget.dart';
-import 'package:monarch/budget_manager.dart';
-import 'package:monarch/homepage.dart';
-import 'package:monarch/navbar.dart';
+import 'package:monarch/support/add.dart';
+import 'package:monarch/other_pages/enviroment.dart';
+import 'package:monarch/main_pages/Statistics/update_budget.dart';
+import 'package:monarch/main_pages/Statistics/budget_manager.dart';
+import 'package:monarch/main_pages/HomePage/homepage.dart';
+import 'package:monarch/main_pages/HomePage/navbar.dart';
 
 class Transaction {
   final String description;

Frontend/monarch/lib/main_pages/Statistics/update_budget.dart

@@ -3,8 +3,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/colors.dart';
-import 'package:monarch/statistics.dart';
+import 'package:monarch/other_pages/colors.dart';
+import 'package:monarch/main_pages/Statistics/statistics.dart';
 
 class UpdateBudget extends StatefulWidget {
   const UpdateBudget({super.key});

Frontend/monarch/lib/support/add.dart

@@ -7,8 +7,8 @@ import 'package:flutter/services.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:http/http.dart' as http;
-import 'package:monarch/enviroment.dart';
-import 'package:monarch/statistics.dart';
+import 'package:monarch/other_pages/enviroment.dart';
+import 'package:monarch/main_pages/Statistics/statistics.dart';
 
 class AddExpenseScreen extends StatefulWidget {
   const AddExpenseScreen({super.key});

Frontend/monarch/lib/support/fetch_service.dart

@@ -2,7 +2,7 @@
 
 import 'package:http/http.dart' as http;
 import 'dart:convert';
-import 'enviroment.dart';
+import '../other_pages/enviroment.dart';
 Future<List<Map<String, dynamic>>> fetchRecentTransactions() async {
   final response = await http.get(
 

Frontend/monarch/lib/support/transcations_recent.dart

@@ -2,7 +2,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:monarch/colors.dart';
+import 'package:monarch/other_pages/colors.dart';
 
 class RecentTransactionsWidget extends StatelessWidget {
   final Future<List<Map<String, dynamic>>> recentTransactions;