Version 2

samarthbc · Aug 6, 2024 · b69d960 · b69d960
1 parent f2b0c9d
commit b69d960
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 29 deletions.
diff --git a/Backend/routes/farmerauth.js b/Backend/routes/farmerauth.js
@@ -91,7 +91,7 @@ router.post('/login',
             const farmer = await Farmer.findOne({ email });
 
             if (!farmer) {
-                return res.status(400).json({ error: "Incoreect username or password", success: false });
+                return res.status(400).json({ error: "Incorrect username or password", success: false });
             }
 
             // To check if password matches

diff --git a/Backend/routes/supplierauth.js b/Backend/routes/supplierauth.js
@@ -170,8 +170,8 @@ router.post('/pfp',upload.single('file'), fetchsupplier,async (req,res)=>{
 
 // Get by id
 router.post('/getbyid',async(req,res)=>{
-    let supplierId = req.supplier.id
-    const supplier = await Supplier.findById(supplierId)
+    const {id} = req.body;
+    const supplier = await Supplier.findById(id)
 
     return res.json(supplier)
 })

diff --git a/Frontend/farmconnectfr/src/componenets/About.js b/Frontend/farmconnectfr/src/componenets/About.js
@@ -85,7 +85,7 @@ function About() {
         <h3 className="nb-fheading">Our Achievements</h3>
         <div className="d-flex justify-content-around flex-nowrap align-items-center" style={{ maxWidth: "90vw", margin: "0 auto", flexWrap: "wrap" }}>
           <img src={require("../static/about/guiness_world_record1.jpg")} alt="" className="img-fluid py-2" style={{ width: "300px", height: "auto", marginLeft: "100px" }} />
-          <p className="container text-center py-2 nb-achievement-text" style={{ fontSize: "20px", marginBottom: "0", paddingLeft: "50px" }}> Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptatibus rerum non quae perferendis. Quisquam, placeat recusandae. Fuga laboriosam perferendis illo quod quis. Nam architecto odit harum, inventore repellat totam laborum blanditiis, voluptate, optio consequuntur nobis minima aspernatur officiis. Pariatur quis nihil tenetur ipsum nesciunt distinctio numquam consectetur delectus corrupti voluptas? </p>
+          <p className="container text-center py-2 nb-achievement-text" style={{ fontSize: "20px", marginBottom: "0", paddingLeft: "50px" }}> The record-breaking achievement underscores Farm-Connect's commitment to leveraging technology to bridge gaps in the agricultural supply chain. By providing a comprehensive and user-friendly interface, the platform has enabled seamless transactions, knowledge sharing, and resource distribution among its members. This connectivity not only enhances operational efficiency but also empowers farmers with access to critical supplies and markets, while allowing buyers to source fresh, high-quality produce directly from the source. </p>
         </div>
       </div>
 
@@ -111,7 +111,7 @@ function About() {
         <div>
           <p className='my-3' style={{ fontWeight: "bold" }}>Copyright © 2024 FARM-CONNECT PVT-LTD ALL RIGHTS RESERVED</p>
           <p className='text-center' style={{ cursor: 'pointer' }}>
-            <Link to='/tac' className='nav-link'>Terms and Conditions</Link>
+            <Link to='/tac' className='nav-link' target='_blank'>Terms and Conditions</Link>
           </p>
         </div>
         <div className="d-flex flex-column p-3">

diff --git a/Frontend/farmconnectfr/src/componenets/Home.js b/Frontend/farmconnectfr/src/componenets/Home.js
@@ -51,33 +51,20 @@ function Home() {
         <div class="d-flex justify-content-between container">
           <div class="card ms-5 me-5">
             <div class="card-body">
-              <p class="card-text">Supplier</p>
-              <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sit, dolor iste. Quidem sapiente itaque aperiam similique quos saepe exercitationem reprehenderit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Hic consectetur earum accusamus aspernatur qui illum suscipit voluptate reprehenderit repellat debitis.</p>
+              <p class="card-text" style={{fontWeight:"bolder"}}>Supplier</p>
+              <p class="card-text">Suppliers on Farm-Connect play a crucial role in supporting the agricultural ecosystem. They provide essential raw materials such as seeds, fertilizers, pesticides, and farming equipment that farmers need to cultivate their crops. By listing their products on Farm-Connect, suppliers gain access to a broad customer base, ranging from small-scale farmers to large agricultural enterprises. This platform enables suppliers to streamline their distribution processes and expand their market reach, fostering a more efficient and interconnected agricultural supply chain. {'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}</p>
             </div>
           </div>
           <div class="card ms-5 me-5">
             <div class="card-body">
-            <p class="card-text">Farmer</p>
-              <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sit, dolor iste. Quidem sapiente itaque aperiam similique quos saepe exercitationem reprehenderit. Lorem ipsum dolor sit amet consectetur adipisicing elit. Hic consectetur earum accusamus aspernatur qui illum suscipit voluptate reprehenderit repellat debitis.</p>
+            <p class="card-text" style={{fontWeight:"bolder"}}>Farmer</p>
+              <p class="card-text">Farmers are the heart of Farm-Connect, utilizing the platform to purchase necessary supplies and sell their produce. With access to a wide range of suppliers, farmers can easily acquire high-quality materials to enhance their farming practices. Once their crops are harvested, farmers can list their produce on Farm-Connect, reaching potential buyers both locally and beyond. The platform also provides farmers with valuable resources such as current agricultural news, updates on farming laws, and educational content to help them stay informed and improve their farming techniques, ultimately leading to better yields and sustainable practices.</p>
             </div>
           </div>
           <div class="card ms-5 me-5">
             <div class="card-body">
-            <p class="card-text">Wholesale/ Retail Buyer</p>
-              <p class="card-text">Lorem ipsum dolor sit, amet consectetur adipisicing elit. Voluptatum omnis tempore quam eius assumenda natus? Eum quam ratione laborum qui. Lorem ipsum, dolor sit amet consectetur adipisicing elit. Aperiam vel autem tenetur maxime nisi, veniam mollitia deserunt suscipit ut reiciendis.</p>
-            </div>
-          </div>
-        </div>
-        <div className="d-flex align-items-center justifycontent-center container mt-4">
-          <div class="card mb-3 mx-3" style={{ maxWidth: "540px" }}>
-            <div class="card-body">
-              <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Autem possimus rerum cupiditate perferendis impedit. Quia velit ducimus nam officia necessitatibus. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aliquam, fugiat.</p>
-            </div>
-          </div>
-
-          <div class="card mb-3 mx-3" style={{ maxWidth: "540px" }}>
-            <div class="card-body">
-              <p class="card-text">Lorem ipsum dolor sit amet consectetur, adipisicing elit. Officiis perferendis beatae nostrum quam, sapiente harum ex! Eos magni vitae nam. Lorem ipsum, dolor sit amet consectetur adipisicing elit. Alias, odio?</p>
+            <p class="card-text" style={{fontWeight:"bolder"}}>Wholesale/ Retail Buyer</p>
+              <p class="card-text">Buyers on Farm-Connect benefit from direct access to fresh, locally-produced agricultural goods. Whether they are individual consumers, retailers, or wholesalers, buyers can browse through a diverse selection of crops and farm products listed by farmers. This direct purchasing process ensures transparency and traceability, allowing buyers to make informed decisions about the quality and origin of their food. Additionally, Farm-Connect's educational features keep buyers informed about the latest agricultural developments and policies, fostering a greater appreciation for sustainable and ethical farming practices.</p>
             </div>
           </div>
         </div>
@@ -100,7 +87,7 @@ function Home() {
             <div class="card-body">
               <h5 class="card-title">Anil Kaur</h5>
               <p class="card-text">Farmer</p>
-              <p class="card-text">Lorem ipsum dolor sit amet consectetur, adipisicing elit. Sit fugit nostrum itaque eligendi voluptatem obcaecati inventore doloribus molestiae, saepe facilis!</p>
+              <p class="card-text">Farm-connect has opened many new possibilities out of the scope of my neighbourhood. It has helped me incline towards modern techniques to enchance farming produce.</p>
               <p class="card-text"><small class="text-body-secondary">30 minutes ago</small></p>
             </div>
           </div>
@@ -109,7 +96,7 @@ function Home() {
             <div class="card-body">
               <h5 class="card-title">Preeti Kapoor</h5>
               <p class="card-text">Buyer</p>
-              <p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sit, dolor iste. Quidem sapiente itaque aperiam similique quos saepe exercitationem reprehenderit.</p>
+              <p class="card-text">This technology has helped me easily keep a track of all my purchases and helped me in optimizing the business. It also helped in faster transport while preserving its quality.</p>
               <p class="card-text"><small class="text-body-secondary">11 hours ago</small></p>
             </div>
           </div>
@@ -118,7 +105,7 @@ function Home() {
             <div class="card-body">
               <h5 class="card-title">Arjun Desai</h5>
               <p class="card-text">Farmer</p>
-              <p class="card-text">Lorem ipsum dolor sit, amet consectetur adipisicing elit. Voluptatum omnis tempore quam eius assumenda natus? Eum quam ratione laborum qui.</p>
+              <p class="card-text">This website has really helped me in knowing the current agricultural innovations and stay up to date with all the facilities provided by the government. {'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}{'\u00A0'}</p>
               <p class="card-text"><small class="text-body-secondary">11 hours ago</small></p>
             </div>
           </div>
@@ -129,7 +116,7 @@ function Home() {
         <div>
           <p className='my-3' style={{ fontWeight: "bold" }}>Copyright © 2024 FARM-CONNECT PVT-LTD ALL RIGHTS RESERVED</p>
           <p className='text-center' style={{ cursor: 'pointer' }}>
-            <Link to='/tac' className='nav-link'>Terms and Conditions</Link>
+            <Link to='/tac' className='nav-link' target='_blank'>Terms and Conditions</Link>
           </p>
         </div>
         <div className="d-flex flex-column p-3">

diff --git a/Frontend/farmconnectfr/src/componenets/Signup.js b/Frontend/farmconnectfr/src/componenets/Signup.js
@@ -158,7 +158,7 @@ function Signup() {
           <div class="form-check mb-3">
             <input class="form-check-input" type="checkbox" value="" id="flexCheckDefault" onChange={handleTac} />
             <label class="form-check-label" for="flexCheckDefault">
-              <Link to="/tac" style={{ textDecoration: "none", color: "black" }}>I agree to Farm-Connect Terms and Conditions</Link>
+              <Link to="/tac" target='_blank'style={{ textDecoration: "none", color: "black" }}>I agree to <span style={{ textDecorationLine:'underline'}}>Farm-Connect Terms and Conditions</span></Link>
             </label>
           </div>