@@ -29,7 +28,6 @@ const Dashboard = () => {
);
case "closedProperties":
return
-
-
-
-
-
-
These are your closed properties.
; - default: return <>; } @@ -38,31 +36,24 @@ const Dashboard = () => { return ( <>-
-
-
-
-
-
+
+
+
{/* Left sidebar */}
-
+
{/* Main content area */}
-
- {/* Other Information
- */}
-
- {/* Static Dashboard greeting */}
-
+
+
+
-
-
+
Welcome to{" "}
{user.result.title}. {user.result.firstName}{" "}
{user.result.middleName} {user.result.lastName}
-
- -
diff --git a/ef-ui/src/components/PropertyView.jsx b/ef-ui/src/components/PropertyView.jsx
index 633aad2..2ae258a 100644
--- a/ef-ui/src/components/PropertyView.jsx
+++ b/ef-ui/src/components/PropertyView.jsx
@@ -9,6 +9,7 @@ import { Modal, Button, Form } from "react-bootstrap"; // Importing Modal compon
import { addFundDetails } from "../redux/features/propertySlice";
import { toast } from "react-toastify";
import { deleteFundDetail } from "../redux/features/propertySlice";
+import "../propertyview.css";
const PropertyView = () => {
const { id } = useParams(); // Extract the property ID from the route
@@ -72,10 +73,28 @@ const PropertyView = () => {
const handleSubmit = (e) => {
e.preventDefault();
- if (formData.fundValue <= 0 || formData.fundPercentage <= 0) {
- return toast.error("Please enter valid funding details");
- }
+ // if (
+ // formData.fundValue <= 0 ||
+ // formData.fundPercentage <= 0 ||
+ // formData.fundPercentage > 100
+ // ) {
+ // return toast.error("Please enter a valid funding amount and percentage (0-100)");
+ // }
+ if (formData.fundValue <= 0) {
+ return toast.error("Please enter a valid funding amount greater than 0");
+ }
+
+ if (
+ formData.fundValue > (selectedProperty?.totalCoststoBuyAtoB || 0)
+ ) {
+ return toast.error(`Funding amount cannot exceed ${selectedProperty?.totalCoststoBuyAtoB || "N/A"}`);
+ }
+
+ if (formData.fundPercentage <= 0 || formData.fundPercentage > 100) {
+ return toast.error("Please enter a valid interest percentage (0-100)");
+ }
+
const fundDetails = {
fundValue: Number(formData.fundValue), // Ensure number conversion if needed
fundPercentage: Number(formData.fundPercentage),
@@ -90,21 +109,29 @@ const PropertyView = () => {
// dispatch(deleteFundDetail({ id, fundDetailId }));
// };
+
+
const handleDelete = (fundDetailId) => {
const token = JSON.parse(localStorage.getItem("profile")).token;
dispatch(deleteFundDetail({ id, fundDetailId, token }));
};
-
+
+ const handleDeleteWithConfirmation = (id) => {
+ const confirmed = window.confirm("Are you sure you want to delete this?");
+ if (confirmed) {
+ handleDelete(id);
+ }
+ };
return (
<>
Welcome to{" "}
- -
+ {activeTab === "dashboard" && (
+ <>
+
+
+
-
-
+
+ )}
- - {/* Dynamic content based on the selected tab */} - {renderTabContent()}
+
@@ -156,14 +141,11 @@ const Dashboard = () => { workflows{" "}
-+
- - {/* Dynamic content based on the selected tab */} - {renderTabContent()}
-
-
-
+ + {/*
+ + {/*
*/}
+
-
-
+
- {
-
- Fund Value: {detail.fundValue}, Fund Percentage:{" "}
- {detail.fundPercentage}%
- {user?.result?.userId ? (
- - {user?.result?._id === detail.userId && ( - - )} -- ) : ( - - )} -
- ))}
-
-
+ + + Total Fund Value: {detail.fundValue}, Interest Percentage: {detail.fundPercentage}% + + ++
+ {user?.result?.userId && user?.result?._id === detail.userId && ( + + )} +
+ ))}
+
+ {/*
*/}
+
{activeTab === "propertydetails" && (
{
{activeTab === "Funding Details" && (
@@ -432,7 +464,7 @@ const PropertyView = () => {
-
)}
- {selectedProperty.fundDetails.length === 0 ? (
-
+ No fund details available.
- ) : ( --
- {selectedProperty.fundDetails.map((detail, index) => (
-
+ {selectedProperty.fundDetails.length === 0 ? (
+
+
+
No fund details available.
+ ) : ( +-
+ {selectedProperty.fundDetails.map((detail, index) => (
+