Merge pull request #79 from Nexusrex18/Lavi

last play..
ShinichiShi · Sep 15, 2024 · 483c0d9 · 483c0d9
2 parents 125c544 + 0978a98
commit 483c0d9
Show file tree

Hide file tree

Showing 8 changed files with 121 additions and 29 deletions.
diff --git a/client/src/assets/chatback.jpg b/client/src/assets/chatback.jpg
diff --git a/client/src/components/Farmer/FDashboard.jsx b/client/src/components/Farmer/FDashboard.jsx
@@ -176,6 +176,13 @@ function Search({handleSearch}) {
 
 function FDashboard() {
   const [searchQuery,setSearchQuery] = useState('');
+  const {currentUser} = useAuth();
+  const navigate = useNavigate();
+  useEffect(() => {
+    if(currentUser === null){
+      navigate('/abc');
+    }
+  },[currentUser,navigate]);
 
   return (
     <div className={styles.dashbody}>

diff --git a/client/src/components/Farmer/FDashboard.module.css b/client/src/components/Farmer/FDashboard.module.css
@@ -222,7 +222,7 @@ body {
 }
 .primary-details {
   width: 70%;
-  font-size: 22px;
+  font-size: 20px;
   /* padding: 30px;
   line-height: 25px; */
   display: flex;

diff --git a/client/src/components/Farmer/FarmNav.jsx b/client/src/components/Farmer/FarmNav.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useContext } from 'react';
+import { useState, useEffect, useContext,useRef } from 'react';
 import styles from './FarmSell.module.css'; // Assuming you're using CSS Modules
 import { toast, ToastContainer } from 'react-toastify';
 import { auth } from '../../../firebase';
@@ -7,6 +7,11 @@ import { useNavigate, useLocation } from 'react-router-dom'; // Import useLocati
 import { doc, getDoc } from 'firebase/firestore';
 import { db } from '../../../firebase';
 import { AuthContext } from '../context/auth_context';
+import { useTranslation } from 'react-i18next';
+import { IoIosArrowDropdown, IoIosArrowDropup } from 'react-icons/io';
+import { MdOutlineTranslate } from 'react-icons/md';
+
+
 
 function ProfileIcon() {
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
@@ -49,6 +54,7 @@ function ProfileIcon() {
     }
   };
 
+
   return (
     <div className={styles.profileicon}>
       <div onClick={toggleDropdown} className={styles.profilebutton}>
@@ -90,13 +96,70 @@ function Navbar() {
     navigate(path);
   };
 
+  const { i18n } = useTranslation();
+  const { t } = useTranslation();
+  const [dropdownOpen, setDropdownOpen] = useState(false);
+  const [language, setLanguage] = useState('Eng');
+  const dropdownRef = useRef(null);
+
+  useEffect(() => {
+    function handleClickOutside(event) {
+      if (dropdownRef.current && !dropdownRef.current.contains(event.target)) {
+        setDropdownOpen(false);
+      }
+    }
+    // const cachedLanguage = localStorage.getItem('language') || i18n.language;
+    // setLanguage(cachedLanguage === 'en' ? 'Eng' : cachedLanguage === 'kn' ? 'ಕನ್ನಡ' : 'हिंदी');
+    // i18n.changeLanguage(cachedLanguage); // Apply cached language if it exists
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  // }, [dropdownRef,i18n]);
+  }, [dropdownRef]);
+
+
   return (
     <header className={styles.headfs}>
       <div className={styles.navp}>
         <div className={styles.h1nav}>
           <h1>Krishi</h1>
           <h1 id={styles.h1e}>Seva</h1>
         </div>
+        <div ref={dropdownRef} className="relative">
+                <div
+                  onClick={() => setDropdownOpen(!dropdownOpen)}
+                  className="cursor-pointer flex items-center justify-center gap-2 hover:bg-slate-300 p-2 rounded"
+                >
+                  <MdOutlineTranslate />
+                  {language}
+                  {dropdownOpen ? <IoIosArrowDropdown /> : <IoIosArrowDropup />}
+                </div>
+                {dropdownOpen && (
+                  <div className="absolute left-0 mt-2 w-24 bg-white border rounded shadow-md">
+                    <ul className="py-1">
+                      <li
+                        className="px-4 py-2 hover:bg-slate-100 cursor-pointer"
+                        // onClick={() => changeLanguage('en')}
+                      >
+                        English
+                      </li>
+                      <li
+                        className="px-4 py-2 hover:bg-slate-100 cursor-pointer"
+                        // onClick={() => changeLanguage('kn')}
+                      >
+                        ಕನ್ನಡ
+                      </li>
+                      <li
+                        className="px-4 py-2 hover:bg-slate-100 cursor-pointer"
+                        // onClick={() => changeLanguage('hi')}
+                      >
+                        हिंदी
+                      </li>
+                    </ul>
+                  </div>
+                )}
+              </div>
         <ProfileIcon />
       </div>
       <div className={styles.navs}>

diff --git a/client/src/components/Farmer/FarmSell.jsx b/client/src/components/Farmer/FarmSell.jsx
@@ -1,49 +1,43 @@
 import styles from './FarmSell.module.css';
 import cropData from './cropsData.json';
-import { useState } from 'react';
+import { useState,useEffect } from 'react';
 import { collection, addDoc, doc,setDoc} from 'firebase/firestore';
 import { db } from '../../../firebase';
 import { useAuth } from '../context/auth_context';
 import { ToastContainer, toast } from 'react-toastify';
+import { useNavigate } from 'react-router-dom';
 import Navbar from './FarmNav';
 
-function Box({ crop }) {
+function Box({ crop, onCropSelect }) {
   return (
-    <div className={styles['box-crop']}>
+    <div className={styles['box-crop']} onClick={() => onCropSelect(crop)}>
       <img src={crop.imageUrl} alt={crop.name} />
       <div className={styles['radio-button']}>
         <label>
-          <input type="radio" name="crop" value={crop.name} />
+          <input
+            type="radio"
+            name="crop"
+            value={crop.name}
+            className={styles.rad}
+            checked={false} // Remove the checked attribute to avoid radio button interference
+            onChange={() => onCropSelect(crop)} // Update crop selection on radio button change
+          />
           {' ' + crop.name}
         </label>
       </div>
     </div>
   );
 }
-
 function Details({ crops, setSelectedCrop, handleInputChange }) {
   return (
     <div className={styles['details-box']}>
       <div className={styles['image-box']}>
         {crops.map((crop, index) => (
-          <div
+          <Box
             key={index}
-            className={styles['box-crop']}
-            onClick={() => setSelectedCrop(crop)}
-          >
-            <img src={crop.imageUrl} alt={crop.name} />
-            <div className={styles['radio-button']}>
-              <label>
-                <input
-                  type="radio"
-                  name="crop"
-                  value={crop.name}
-                  onChange={() => setSelectedCrop(crop)}
-                />
-                {' ' + crop.name}
-              </label>
-            </div>
-          </div>
+            crop={crop}
+            onCropSelect={setSelectedCrop}
+          />
         ))}
       </div>
       <div className={styles.formbox}>
@@ -203,6 +197,15 @@ function Search({ searchQuery, setSearchQuery, handleSearch }) {
 }
 
 function FarmSell() {
+
+  const {currentUser} = useAuth();
+  const navigate = useNavigate();
+  useEffect(() => {
+    if(currentUser === null){
+      navigate('/abc');
+    }
+  },[currentUser,navigate]);
+
   const [searchQuery, setSearchQuery] = useState('');
   const [filteredCrops, setFilteredCrops] = useState(cropData.crops);
   const [selectedCrop, setSelectedCrop] = useState(null);
@@ -217,7 +220,7 @@ function FarmSell() {
     pincode: '',
   });
 
-  const { currentUser } = useAuth(); // Get the current user from AuthContext
+  // const { currentUser } = useAuth();
 
   const handleSearch = () => {
     const filtered = cropData.crops.filter((crop) =>

diff --git a/client/src/components/Farmer/FarmSell.module.css b/client/src/components/Farmer/FarmSell.module.css
@@ -21,7 +21,7 @@ body {
     align-items: center;
     justify-content: space-between; */
     display: grid;
-    grid-template-columns: 3.5fr 0.4fr;
+    grid-template-columns: 3.5fr 0.4fr 0.4fr;
     align-items: center;
     border: 0.5px solid rgb(159, 159, 159);
   }
@@ -237,6 +237,10 @@ body {
   border-radius: 0.3rem;
   box-shadow: 2px 2px 2px rgba(8, 0, 0, 0.4);
 }
+.box-crop:hover{
+  box-shadow: 4px 4px 4px rgba(61, 161, 31, 0.4);
+
+}
 .box-crop img {
   width: 100%;
   height: 80%;
@@ -405,4 +409,6 @@ border-color: yellowgreen;
     color: #00B207;
   }
   /* ``````````````````````````````````````   */
-
+  .rad{
+    display: none;
+  }
diff --git a/client/src/components/Negotiate/chat.module.css b/client/src/components/Negotiate/chat.module.css
@@ -65,14 +65,16 @@
 .chat{
     display: flex;
     flex-direction: column;
-    background-color: rgb(228, 226, 226);
+    background-color: #fefefe;
+    border: 1px solid rgba(128, 128, 128, 0.267);
 }
 .clientpfp{
     height:7.4vh;
     width: 76vw;
     text-align: center;
     padding: 8px;
-    background-color: whitesmoke;
+    background-color: #fefefe;
+    border: 1px solid rgba(128, 128, 128, 0.267);
     font-size: 25px;
     display: flex;
     justify-content: space-between;
@@ -106,6 +108,7 @@
     overflow-y: scroll;
     height: 80vh; /* Adjust based on layout */
     padding: 10px;
+    background-image: url('https://i.pinimg.com/564x/8c/98/99/8c98994518b575bfd8c949e91d20548b.jpg');
 }
 .send{
     display: flex;
@@ -127,6 +130,7 @@
     overflow-y: auto;
     border-radius: 10px;
     resize: none;
+    border: 0.25px solid rgba(128, 128, 128, 0.267);
 }
 .send>button {
     /* border-radius:10px; */

diff --git a/client/src/components/ProfileSetup/Profilesetup.jsx b/client/src/components/ProfileSetup/Profilesetup.jsx
@@ -4,12 +4,21 @@ import styles from './profilesetup.module.css'; // Import the CSS module
 import { db } from '../../../firebase';
 import { setDoc,doc } from 'firebase/firestore';
 import { AuthContext } from '../context/auth_context';
+import { useNavigate } from 'react-router-dom';
 
 import Navbar from '../Farmer/FarmNav';
 
 export default function Profilesetup() {
   const { currentUser } = useContext(AuthContext);  // Get currentUser from AuthContext
   const port = import.meta.env.VITE_PORT;
+  // const {currentUser} = useAuth();
+  const navigate = useNavigate();
+  useEffect(() => {
+    if(currentUser === null){
+      navigate('/abc');
+    }
+  },[currentUser,navigate]);
+
 
   const [imagePreview1, setImagePreview1] = useState(null);
   const [imagePreview2, setImagePreview2] = useState(null);