Merge pull request #24 from jib2004/dev

Debugging
InternPulse · Oct 9, 2024 · c45d938 · c45d938
2 parents 5106ca2 + 4ea3b13
commit c45d938
Show file tree

Hide file tree

Showing 13 changed files with 480 additions and 2,312 deletions.
diff --git a/jsconfig.json b/jsconfig.json
@@ -17,7 +17,6 @@
 
     }
 
-  }
-
+
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/App.jsx b/src/App.jsx
@@ -131,50 +131,7 @@ function App() {
 
     </Router>
 
-        {/* Main Application Routes */}
-        <Routes>
-          <Route
-            path="/dashboard"
-            element={
-              <MainLayout>
-                <Dashboard />
-              </MainLayout>
-            }
-          />
-          <Route
-            path="/manage-properties"
-            element={
-              <MainLayout>
-                <ManageProperties />
-              </MainLayout>
-            }
-          />
-          <Route
-            path="/manage-properties/add-property"
-            element={
-              <MainLayout>
-                <AddProperties />
-              </MainLayout>
-            }
-          />
-          <Route
-            path="/manage-properties/add-property/preview"
-            element={
-              <MainLayout>
-                <Preview />
-              </MainLayout>
-            }
-          />
-          <Route
-            path="/messages"
-            element={
-              <MainLayout>
-                <Messages />
-              </MainLayout>
-            }
-          />
-        </Routes>
-      </Router>
+
     </>
   );
 

diff --git a/src/components/generalComponents/Navbar.jsx b/src/components/generalComponents/Navbar.jsx
@@ -1,9 +1,4 @@
-import { useContext } from "react";
-import hamburger_menu from "../../assets/hamburger.png";
-import user from "../../assets/icons/Frame 1000010090.png";
-import notificationIcon from "../../assets/icons/Group 1000002800.png";
-import downArrow from "../../assets/icons/Profile arrow.png";
-import DisplayContext from "../../context/DispalyContext";
+
 
 
 import notificationIcon from '../../assets/images/Group 1000002800.png'
@@ -40,26 +35,7 @@ const Navbar = ({pagetitle}) => {
       },[show])
 
 
-  return (
-    <nav className=' w-full bg-[#FCFDFD] pt-[16px] pb-[8px] px-2 xl:px-[40px] gap-0 md:gap-3 xl:gap-0 flex justify-between items-center'>
-        <div>
-            <h1 className='md:text-[20px] xl:text-[28px] leading-[36px] tracking-[-1px] font-semibold text-[#242828]'>{pagetitle}</h1>
-        </div>
-
-        <div>
-            <input type="search" name="" id=""  placeholder='Search Property' value={show} onChange={handleSearch} className='bg-[#F5F6F6] md:w-[461px] py-[2px] px-[8px] md:h-[48px]'/>
-        </div>
-
-        <div className='hidden xl:block'>
-            <ul className='flex items-center gap-3'>
-                <li><img src={notificationIcon} alt="" /></li>
-                <li className='flex items-center  gap-2'>
-                    <img src={user} alt="" className='size-[48px]  rounded-full object-contain'/>
-                    <div className='flex items-center'><span>DreamHomes</span> <img src={downArrow} alt="" /></div>
-
-                </li>
-            </ul>
-        </div>
+
 
 
   return (

diff --git a/src/components/generalComponents/Sidebar.jsx b/src/components/generalComponents/Sidebar.jsx
@@ -57,18 +57,7 @@ try {
             <img src={logo} alt="logo" />
         </div>
 
-        <div className=' w-full '>
-            <ul className='w-full '>
-            <li className={`${pathname.includes('/dashboard') && 'border-l-[4px] border-white bg-[#389294]'}`}><Link className='pl-5 flex items-center gap-3 py-[12px] text-[20px] leading-[28px] tracking-[-0.75px]' to={'/dashboard'}><img src={dasboardIcon} alt="" /><span>Dashboard</span></Link></li>
-            <li className={`${pathname.includes('/manage-properties') && 'border-l-[4px] border-white bg-[#389294]'}`}><Link to={'/manage-properties'} className='pl-5 flex items-center gap-3 py-[12px] text-[20px] leading-[28px] tracking-[-0.75px]'><img src={manangeIcon} alt="" /><span>Manage Properties</span></Link></li>
-                <li className={`${pathname.includes('/transactions') && 'border-l-[4px] border-white bg-[#389294]'}`}><Link to="/transactions" className='pl-5 flex items-center gap-3 py-[12px] text-[20px] leading-[28px] tracking-[-0.75px]'><img src={transactionsIcon} alt="" /><span>Transactions</span></Link></li>
-
-
-
-                <li className={`${pathname.includes('/inquiries') && 'border-l-[4px] border-white bg-[#389294]'}`}><Link to={'/inquiries'} className='pl-5 flex items-center gap-3 py-[12px] text-[20px] leading-[28px] tracking-[-0.75px]'><img src={inquiriesIcon} alt="" /><span>Inquiries</span></Link></li>
-                <li className={`${pathname.includes('/messages') && 'border-l-[4px] border-white bg-[#389294]'}`}><Link className='pl-5 flex items-center gap-3 py-[12px] text-[20px] leading-[28px] tracking-[-0.75px]' to={'/messages'}><img src={messagesIcon} alt="" /><span>Messages</span></Link></li>
-            </ul>
-        </div>
+
 
       <div className="w-full">
         <ul className="w-full">

diff --git a/src/pages/Buyers/BuyersNavbar.jsx b/src/pages/Buyers/BuyersNavbar.jsx
@@ -1,7 +1,9 @@
-import React from 'react'
+
 import logo from '../../assets/logos/Left Nav.svg'
 import { useLocation,useNavigate } from 'react-router-dom'
 
+const user = localStorage.getItem("userData")
+
 const BuyersNavbar = () => {
     const {pathname} = useLocation()
     const navigate = useNavigate()
@@ -16,15 +18,21 @@ const BuyersNavbar = () => {
             <li className='text-[16px] leading-6 tracking-[-0.5px] text-[#3F86FA]'>Contact Us</li>
         </ul>
 
-
+        {user ?
+        <div>
+        <button className='w-[127px] h-[48px] rounded-lg px-[20px] py-[12px] bg-[#3F86FA] text-white font-medium text-[16px] leading-6 tracking-[-0.5px]' >Dashboard</button>
+    </div>
+        :
         <div className='flex gap-4'>
+
             <div>
                 <button className='w-[127px] h-[48px] rounded-lg px-[20px] py-[12px] text-[#3F86FA] border border-[#3F86FA] font-medium text-[16px] leading-6 tracking-[-0.5px]' onClick={()=>navigate('/buyer-signin')}>Sign In</button>
             </div>
             <div>
             <button className='w-[127px] h-[48px] rounded-lg px-[20px] py-[12px] bg-[#3F86FA] text-white font-medium text-[16px] leading-6 tracking-[-0.5px]' onClick={()=>navigate('/buyer-signup')}>Sign Up</button>
             </div>
         </div>
+        }
     </nav>
   )
 }

diff --git a/src/pages/Buyers/PropertyDescription.jsx b/src/pages/Buyers/PropertyDescription.jsx
@@ -20,7 +20,7 @@ const PropertyDescription = () => {
 
     const handlePurchase = async () =>{
         try {
-            const res = await Instance2.post('/purchase',{
+             await Instance2.post('/purchase',{
                 propertyId:productId,
                 userId:1,
                 paymentMethod:'Transfer',
@@ -38,6 +38,7 @@ const PropertyDescription = () => {
                 const res = await Instance2.get(`/properties/${id}`)
                 const similar = await Instance2.get(`/properties/search?city=${res.data.data.city}`)
                 setProperty(res.data.data)
+                console.log(res.data.data)
                 setSimilarity(similar.data.data)
                 setAmount(res.data.data.price)
                 setProductId(res.data.data.id)
@@ -47,7 +48,7 @@ const PropertyDescription = () => {
             }
         }
         getProperty()
-    },[id])
+    },[id,amount])
 
   return (
     <div className=''>