From ac723810c58183753469562f639c596abf93a617 Mon Sep 17 00:00:00 2001 From: Atharva Date: Sun, 23 Feb 2025 07:00:07 +0530 Subject: [PATCH] Fix:Added Create finanace and View Finance --- Frontend/src/main.jsx | 1 - Frontend/src/pages/UserPanel/Farm/AddFarm.jsx | 5 +- .../UserPanel/Farm/CreateTransactions.jsx | 50 ++++++++++++++ .../src/pages/UserPanel/Farm/EditFarm.jsx | 1 + .../src/pages/UserPanel/Farm/FarmPage.jsx | 10 ++- .../src/pages/UserPanel/Farm/Transactions.jsx | 68 +++++++++++++++++++ 6 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 Frontend/src/pages/UserPanel/Farm/CreateTransactions.jsx create mode 100644 Frontend/src/pages/UserPanel/Farm/Transactions.jsx diff --git a/Frontend/src/main.jsx b/Frontend/src/main.jsx index 528eb4f..0bbb357 100644 --- a/Frontend/src/main.jsx +++ b/Frontend/src/main.jsx @@ -26,7 +26,6 @@ import Monitoring from "./pages/UserPanel/Monitoring.jsx"; import AddFarm from "./pages/UserPanel/Farm/AddFarm.jsx"; import UpdateFarm from "./pages/UserPanel/Farm/UpdateForm.jsx"; import FarmPage from "./pages/UserPanel/Farm/FarmPage.jsx"; -import EditFarm from "./pages/UserPanel/Farm/EditFarm.jsx"; createRoot(document.getElementById("root")).render( diff --git a/Frontend/src/pages/UserPanel/Farm/AddFarm.jsx b/Frontend/src/pages/UserPanel/Farm/AddFarm.jsx index 8348034..30f0ed4 100644 --- a/Frontend/src/pages/UserPanel/Farm/AddFarm.jsx +++ b/Frontend/src/pages/UserPanel/Farm/AddFarm.jsx @@ -44,6 +44,7 @@ const AddFarm = () => { setSuccess(true); setError(null); setIsModalOpen(false); + window.location.reload(); } catch (err) { setError(err.message); setSuccess(false); @@ -53,7 +54,9 @@ const AddFarm = () => { return ( <> + {message &&

{message}

} + + ); +}; + +export default CreateFinance; diff --git a/Frontend/src/pages/UserPanel/Farm/EditFarm.jsx b/Frontend/src/pages/UserPanel/Farm/EditFarm.jsx index 21dbabb..ec07c46 100644 --- a/Frontend/src/pages/UserPanel/Farm/EditFarm.jsx +++ b/Frontend/src/pages/UserPanel/Farm/EditFarm.jsx @@ -17,6 +17,7 @@ const EditFarm = ({ _id, onDelete }) => { if (onDelete) onDelete(_id); } setModalOpen(false); // Close the modal after the operation + window.location.reload(); } catch (error) { console.error("Error deleting farm:", error); } diff --git a/Frontend/src/pages/UserPanel/Farm/FarmPage.jsx b/Frontend/src/pages/UserPanel/Farm/FarmPage.jsx index 32ed12f..53f0907 100644 --- a/Frontend/src/pages/UserPanel/Farm/FarmPage.jsx +++ b/Frontend/src/pages/UserPanel/Farm/FarmPage.jsx @@ -2,6 +2,8 @@ import React, { useEffect, useState } from "react"; import { useParams, useNavigate } from "react-router-dom"; import Farm from "./Farm"; import CropTable from "./CropTable"; +import Transactions from "./Transactions"; +import CreateTransactions from "./CreateTransactions"; export default function FarmPage() { const { farmId } = useParams(); @@ -59,9 +61,15 @@ export default function FarmPage() {
-
+
+
+ +
+
+ +
); } diff --git a/Frontend/src/pages/UserPanel/Farm/Transactions.jsx b/Frontend/src/pages/UserPanel/Farm/Transactions.jsx new file mode 100644 index 0000000..4bd38bf --- /dev/null +++ b/Frontend/src/pages/UserPanel/Farm/Transactions.jsx @@ -0,0 +1,68 @@ +import { useEffect, useState } from "react"; +import Td from "../../../components/Td"; + +const Transactions = ({ farmId }) => { + const [data, setData] = useState([]); + const [loading, setLoading] = useState(true); + + useEffect(() => { + fetch(`http://localhost:8000/api/v1/finance/${farmId}`, { + credentials: "include", + method: "GET", + headers: { "Content-Type": "application/json" }, + }) + .then((response) => response.json()) + .then((data) => { + setData(data); + console.log("Fetched data:", data); + setLoading(false); + }) + .catch((error) => { + console.error("Error fetching transactions:", error); + setLoading(false); + }); + }, [farmId]); + + return ( +
+ {loading ? ( +
Loading...
+ ) : ( + + + + + + + + + + + + {Array.isArray(data) && data.length > 0 ? ( + data.map((item) => + + + )} + +
+ Farm name + + Location + + Type + + Size (acres) + + Action +
) + ) : ( +
+ No data available +
+ )} +
+ ); +}; + +export default Transactions;