AgriConnect
@@ -88,7 +88,7 @@ function BHeader() {
- handleNavigate('deals')}>Deals -
- handleNavigate('contract')}>Contract Status +
- handleNavigate('contract')}>Contracts
- handleNavigate('transactions')}>Transactions
- handleNavigate('notifications')}>Notifications
- handleNavigate('settings')}>Settings diff --git a/client/src/components/Buyer/Contract/BContract.jsx b/client/src/components/Buyer/Contract/BContract.jsx index 4b72560..4793f32 100644 --- a/client/src/components/Buyer/Contract/BContract.jsx +++ b/client/src/components/Buyer/Contract/BContract.jsx @@ -1,11 +1,13 @@ import { useContext, useEffect, useState } from 'react'; -import { AuthContext } from '../../context/Authcontext'; +import { AuthContext } from '../../context/AuthContext'; import { db } from '../../../../firebase'; import { getDoc, doc } from 'firebase/firestore'; import ContractStatus from './ContractStatus'; +import GenerateContract from './GenerateContract' export default function BContract() { const { currentUser } = useContext(AuthContext); const [contracts, setContracts] = useState([]); // Initialize state to store contracts + const [choice, setChoice] = useState('generate'); useEffect(() => { const fetchDetails = async () => { @@ -27,25 +29,53 @@ export default function BContract() { }, [currentUser]); return ( -
-
+
+ Contract Agreement
+ Farmer Name: {formData.farmerName}
+ Buyer Name: {formData.buyerName}
+ Contract Date: {formData.contractDate}
+ Crop: {formData.crop}
+ Quantity: {formData.quantity}
+ Price: {formData.price}
+ Delivery Date: {formData.deliveryDate}
+
+
+);
+
+// Contract Form Component
+const PdfDetails = () => {
+ const { register, handleSubmit, watch } = useForm();
+ const formData = watch(); // To watch form changes
+
+ return (
+
@@ -124,7 +124,7 @@ export default function PaymentSetting() {
name="branch_name"
value={bank.branch_name}
onChange={(e) => handleChange(e, setBank)}
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border placeholder:text-black border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
disabled={!isEditable}
/>
handleChange(e, setBank)}
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border placeholder:text-black border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
disabled={!isEditable}
/>
handleChange(e, setBank)}
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border placeholder:text-black border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
disabled={!isEditable}
/>
setConfirmNumber(e.target.value)}
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border placeholder:text-black border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
disabled={!isEditable}
/>
handleChange(e, setBank)}
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border placeholder:text-black border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
disabled={!isEditable}
/>
-
- )
+ );
}
diff --git a/client/src/components/Buyer/Contract/Download.jsx b/client/src/components/Buyer/Contract/Download.jsx
new file mode 100644
index 0000000..839ec60
--- /dev/null
+++ b/client/src/components/Buyer/Contract/Download.jsx
@@ -0,0 +1,8 @@
+
+export default function Download() {
+ return (
+ Contract History :
-
-
- Date
- Total
- Status
- Details
-
- {contracts.length > 0 ? (
- contracts.map((contract, index) => (
-
-No contracts found
+
+
-
+
+
+ {choice==='generate' && (
+
+ {
+ setChoice('generate');
+ }}
+ >
+ Generate Contract
+
+ {
+ setChoice('status');
+ }}
+ >
+ Contract Status
+
+
+
)}
+ Contract History :
+
+
+
+ Date
+ Total
+ Status
+ Details
+
+ {contracts.length > 0 ? (
+ contracts.map((contract, index) => (
+
+ + No contracts found +
+ )} +
+
+
+ )
+}
diff --git a/client/src/components/Buyer/Contract/GenerateContract.jsx b/client/src/components/Buyer/Contract/GenerateContract.jsx
new file mode 100644
index 0000000..eea43b4
--- /dev/null
+++ b/client/src/components/Buyer/Contract/GenerateContract.jsx
@@ -0,0 +1,105 @@
+import { useState } from "react";
+import { MdDone } from "react-icons/md";
+import PdfDetails from "./PdfDetails";
+import Metamask from "./Metamask";
+import Download from "./Download";
+export default function GenerateContract() {
+
+ const steps = ["Fill Details", "Connect to Metamask", "Download Pdf"];
+ const [currentStep, setCurrentStep] = useState(1);
+// const [complete, setComplete] = useState(false);
+
+ const handleNext = () => {
+ if (currentStep === steps.length) {
+ // setComplete(true);
+ } else {
+ setCurrentStep((prev) => prev + 1);
+ }
+ };
+
+ const handleBack = () => {
+ if (currentStep > 1) {
+ setCurrentStep((prev) => prev - 1);
+ }
+ };
+ return (
+ <>
+
+
+
+ );
+}
diff --git a/client/src/components/Buyer/Contract/Metamask.jsx b/client/src/components/Buyer/Contract/Metamask.jsx
new file mode 100644
index 0000000..973a8a9
--- /dev/null
+++ b/client/src/components/Buyer/Contract/Metamask.jsx
@@ -0,0 +1,7 @@
+export default function Metamask() {
+ return (
+
+ {steps?.map((step, i) => (
+
+ {steps[currentStep-1] === 'Fill Details' && (
+ <>
+
+
+ ))}
+
+ {i + 1 < currentStep ? (
+
+ + {step} +
+ {i !== 0 && ( + + )} +
+
+
+
+
+
+
+
+ )
+}
diff --git a/client/src/components/Buyer/Contract/Pdf.jsx b/client/src/components/Buyer/Contract/Pdf.jsx
new file mode 100644
index 0000000..e2a64d5
--- /dev/null
+++ b/client/src/components/Buyer/Contract/Pdf.jsx
@@ -0,0 +1,81 @@
+import { useState } from 'react';
+import jsPDF from 'jspdf';
+// import 'jspdf-autotable'; // Optional: if you want to use table features
+
+const Pdf = () => {
+ const [contractDetails, setContractDetails] = useState({
+ buyerName: '',
+ sellerName: '',
+ contractDate: '',
+ details: ''
+ });
+
+ const handleChange = (e) => {
+ const { name, value } = e.target;
+ setContractDetails({ ...contractDetails, [name]: value });
+ };
+
+ const generatePDF = () => {
+ const doc = new jsPDF();
+
+ doc.setFontSize(16);
+ doc.text('Contract Details', 20, 20);
+
+ doc.setFontSize(12);
+ doc.text(`Buyer Name: ${contractDetails.buyerName}`, 20, 30);
+ doc.text(`Seller Name: ${contractDetails.sellerName}`, 20, 40);
+ doc.text(`Contract Date: ${contractDetails.contractDate}`, 20, 50);
+ doc.text('Details:', 20, 60);
+ doc.text(contractDetails.details, 20, 70);
+
+ doc.save('contract.pdf');
+ };
+
+ return (
+
+
+ );
+};
+
+export default Pdf;
diff --git a/client/src/components/Buyer/Contract/PdfDetails.jsx b/client/src/components/Buyer/Contract/PdfDetails.jsx
new file mode 100644
index 0000000..fb98011
--- /dev/null
+++ b/client/src/components/Buyer/Contract/PdfDetails.jsx
@@ -0,0 +1,109 @@
+import { useForm } from "react-hook-form";
+import { Document, Page, Text, PDFDownloadLink } from "@react-pdf/renderer";
+
+// PDF Document Component
+const ContractPDF = ({ formData }) => (
+ Contract Form
+ +
+
+ );
+};
+
+export default PdfDetails;
diff --git a/client/src/components/Buyer/Settings/PaymentSetting.jsx b/client/src/components/Buyer/Settings/PaymentSetting.jsx
index e6e814f..aeb57f9 100644
--- a/client/src/components/Buyer/Settings/PaymentSetting.jsx
+++ b/client/src/components/Buyer/Settings/PaymentSetting.jsx
@@ -1,5 +1,5 @@
import { useContext, useState, useEffect } from 'react';
-import { AuthContext } from '../../context/Authcontext';
+import { AuthContext } from '../../context/AuthContext';
import { db } from '../../../../firebase';
import { ToastContainer, toast } from 'react-toastify';
import { doc, getDoc, setDoc } from 'firebase/firestore';
@@ -105,7 +105,7 @@ export default function PaymentSetting() {
name="ifsc"
value={bank.ifsc}
onChange={(e) => handleChange(e, setBank)}
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border placeholder:text-black border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
disabled={!isEditable}
/>
handleChange(e, setBank)}
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border placeholder:text-black border-gray-300 rounded ${isEditable ? '' : 'bg-slate-400'} `}
disabled={!isEditable}
/>
Create Contract
+ + + {/* Display PDF Download link only if form is filled */} + {formData.farmerName && ( +
+
+ )}
+
- 
-
-
+
+
@@ -177,7 +193,7 @@ export default function ProfileSetting() {
value={profile.displayName}
onChange={(e) => handleInputChange(e, setProfile)}
placeholder="First Name"
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable.profile ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.profile ? '' : 'bg-slate-400'} `}
disabled={!isEditable.profile}
/>
handleInputChange(e, setProfile)}
placeholder="Last Name"
- className={`w-1/2 p-2 border border-gray-300 rounded ${isEditable.profile ? '' : 'bg-slate-400'} `}
+ className={`w-1/2 p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.profile ? '' : 'bg-slate-400'} `}
disabled={!isEditable.profile}
/>
@@ -196,30 +212,36 @@ export default function ProfileSetting() {
value={profile.email}
onChange={(e) => handleInputChange(e, setProfile)}
placeholder="Email"
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.profile ? '' : 'bg-slate-400'} `}
+ className={`w-full p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.profile ? '' : 'bg-slate-400'} `}
disabled={!isEditable.profile}
/>
handleInputChange(e, setProfile)}
placeholder="Phone Number"
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.profile ? '' : 'bg-slate-400'} `}
+ className={`w-full p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.profile ? '' : 'bg-slate-400'} `}
disabled={!isEditable.profile}
/>
- 
-
+
@@ -249,7 +271,7 @@ export default function ProfileSetting() {
value={address.addr1}
onChange={(e) => handleInputChange(e, setAddress)}
placeholder="Address Line 1"
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
+ className={`w-full p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
disabled={!isEditable.address}
/>
handleInputChange(e, setAddress)}
placeholder="Address Line 2"
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
+ className={`w-full p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
disabled={!isEditable.address}
/>
handleInputChange(e, setAddress)}
placeholder="Company Name (optional)"
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
+ className={`w-full p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
disabled={!isEditable.address}
/>
handleInputChange(e, setAddress)}
placeholder="Street Address"
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
+ className={`w-full p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
disabled={!isEditable.address}
/>
@@ -372,7 +396,6 @@ export default function ProfileSetting() {
@@ -284,7 +306,7 @@ export default function ProfileSetting() {
name="country"
value={address.country}
onChange={(e) => handleInputChange(e, setAddress)}
- className={`w-1/3 p-2 border border-gray-300 rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
+ className={`w-1/3 p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
disabled={!isEditable.address}
>
@@ -295,16 +317,16 @@ export default function ProfileSetting() {
value={address.state}
onChange={(e) => handleInputChange(e, setAddress)}
placeholder="State"
- className={`w-1/3 p-2 border border-gray-300 rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
+ className={`w-1/3 p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
disabled={!isEditable.address}
/>
handleInputChange(e, setAddress)}
placeholder="Zip Code"
- className={`w-1/3 p-2 border border-gray-300 rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
+ className={`w-1/3 p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.address ? '' : 'bg-slate-400'} `}
disabled={!isEditable.address}
/>
@@ -319,7 +341,7 @@ export default function ProfileSetting() {
@@ -335,7 +357,7 @@ export default function ProfileSetting() {
placeholder="Current Password"
value={currentPassword}
onChange={(e) => setCurrentPassword(e.target.value)}
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.password ? '' : 'bg-slate-400'} `}
+ className={`w-full p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.password ? '' : 'bg-slate-400'} `}
disabled={!isEditable.password}
/>
setNewPassword(e.target.value)}
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.password ? '' : 'bg-slate-400'} `}
+ className={`w-full p-2 border border-gray-300 placeholder:text-black rounded ${isEditable.password ? '' : 'bg-slate-400'} `}
disabled={!isEditable.password}
/>
{setConfirmPassword(e.target.value)}}
- className={`w-full p-2 border border-gray-300 rounded ${isEditable.password ? '' : 'bg-slate-400'} `}
+ onChange={(e) => {
+ setConfirmPassword(e.target.value);
+ }}
+ className={`w-full p-2 border border-gray-300 rounded placeholder:text-black ${isEditable.password ? '' : 'bg-slate-400'} `}
disabled={!isEditable.password}
/>
+
+ Contract Count: {contractCount} */}
+ Contract Count: {contractCount}
+ {/* Total number of contracts created
+ */}
+
+
+ );
+};
+
+export default MultiAgriConnectInteract;
\ No newline at end of file
diff --git a/client/src/components/LandingPage/Landing.css b/client/src/components/LandingPage/Landing.module.css
similarity index 98%
rename from client/src/components/LandingPage/Landing.css
rename to client/src/components/LandingPage/Landing.module.css
index 928cac9..8ee8708 100644
--- a/client/src/components/LandingPage/Landing.css
+++ b/client/src/components/LandingPage/Landing.module.css
@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css2?family=Teko:wght@300..700&display=swap" rel="stylesheet');
+/* @import url('https://fonts.googleapis.com/css2?family=Teko:wght@300..700&display=swap" rel="stylesheet'); */
body {
font-family: 'Teko', sans-serif;
}
diff --git a/client/src/components/LandingPage/Navbar.jsx b/client/src/components/LandingPage/Navbar.jsx
index b55986b..be57b53 100644
--- a/client/src/components/LandingPage/Navbar.jsx
+++ b/client/src/components/LandingPage/Navbar.jsx
@@ -1,6 +1,6 @@
-import React from "react";
+// import React from "react";
import 'tailwindcss/tailwind.css';
-import './Landing.css'; // Ensure you also adjust any custom styles if necessary
+// import './Landing.module.css'; // Ensure you also adjust any custom styles if necessary
export default function Navbar() {
return (
diff --git a/client/src/components/NotFoundPage.jsx b/client/src/components/NotFoundPage.jsx
index e3bf954..e7b785b 100644
--- a/client/src/components/NotFoundPage.jsx
+++ b/client/src/components/NotFoundPage.jsx
@@ -1,6 +1,7 @@
import { useNavigate } from 'react-router-dom';
import { MdHome } from 'react-icons/md';
import BHeader from './Buyer/BHeader';
+
import errImage from '../assets/err.jpg';
const NotFoundPage = () => {
const navigate = useNavigate();
@@ -19,6 +20,7 @@ const NotFoundPage = () => {
It looks like the page you are looking for doesn't exist or has
been moved.
+
MultiAgriConnect Interaction
+ + {/*
+
+
+ Create Contract
+ setFarmerAddress(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + setContractDetails(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + setTotalAmount(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + setInstallmentAmount(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + +
+
+
+ Get Contract Details
+ setSelectedContractId(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + + {contractInfo && ( +
+
+ )}
+ Farmer: {contractInfo.farmer}
+Buyer: {contractInfo.buyer}
+Details: {contractInfo.contractDetails}
+Signed: {contractInfo.isSigned ? 'Yes' : 'No'}
+Total Amount: {contractInfo.totalAmount} ETH
+Installment Amount: {contractInfo.installmentAmount} ETH
+Installments Remaining: {contractInfo.installmentsRemaining}
+Next Payment Due: {contractInfo.nextPaymentDue}
+
+
+ Get Payments Made
+ setSelectedContractId(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + + {paymentsMade > 0 && ( +Total Payments Made: {paymentsMade} ETH
+ )} +
+ setShowSignContractDialog(false)}
+ > */}
+ {/* */}
+ Are you sure you want to sign the contract with ID {selectedContractId}?
+ {/* */}
+ {/* */}
+
+ {/* */}
+ {/* */}
+
+
+ Sign Contract
+ setSelectedContractId(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + {/* */} + {/*
+ setShowMakePaymentDialog(false)}
+ > */}
+ Make Payment
+ {/* */}
+ */}
+ {/* */}
+
+ {/* */}
+ {/* */}
+
+ Make Payment
+ setSelectedContractId(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + setInstallmentAmount(e.target.value)} + className="w-full p-2 mb-2 border rounded" + /> + {/* */} + {/*Are you sure you want to make a payment of {installmentAmount} ETH for the contract with ID {selectedContractId}?
+ {/*