Merge branch 'dev' into dev

InternPulse · Oct 10, 2024 · a687476 · a687476
2 parents fcb798c + 989c6d7
commit a687476
Show file tree

Hide file tree

Showing 16 changed files with 237 additions and 86 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -1,48 +1,45 @@
-
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/assets/Logo-D-PRSjT1.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Property Hive</title>
-    <script type="module" crossorigin src="/assets/index-BJTm2EYz.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CyqVn5bQ.css">
-  </head>
-  <body>
-    <div id="root"></div>
-
-  </body>
-
-	<head>
-		<meta charset="UTF-8" />
-		<link
-			rel="icon"
-			type="image/svg+xml"
-			href="/vite.svg"
-		/>
-		<meta
-			name="viewport"
-			content="width=device-width, initial-scale=1.0"
-		/>
-		<link
-			rel="preconnect"
-			href="https://fonts.googleapis.com"
-		/>
-		<link
-			rel="preconnect"
-			href="https://fonts.gstatic.com"
-			crossorigin
-		/>
-		<link
-			href="https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100..900;1,100..900&display=swap"
-			rel="stylesheet"
-		/>
-		<title>Property Hive</title>
-	</head>
-	<body>
-		<div id="root"></div>
-
-	</body>
-
-</html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/assets/Logo-D-PRSjT1.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Property Hive</title>
+    <script type="module" crossorigin src="/assets/index-DgJjukMA.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BTxQunli.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+
+	<head>
+		<meta charset="UTF-8" />
+		<link
+			rel="icon"
+			type="image/svg+xml"
+			href="/vite.svg"
+		/>
+		<meta
+			name="viewport"
+			content="width=device-width, initial-scale=1.0"
+		/>
+		<link
+			rel="preconnect"
+			href="https://fonts.googleapis.com"
+		/>
+		<link
+			rel="preconnect"
+			href="https://fonts.gstatic.com"
+			crossorigin
+		/>
+		<link
+			href="https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100..900;1,100..900&display=swap"
+			rel="stylesheet"
+		/>
+		<title>Property Hive</title>
+	</head>
+	<body>
+		<div id="root"></div>
+	</body>
+
+</html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,14 +12,12 @@
     "test:ui": "vitest --ui"
   },
   "dependencies": {
-
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
     "@fortawesome/fontawesome-svg-core": "^6.6.0",
     "@fortawesome/free-solid-svg-icons": "^6.6.0",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@mui/material": "^6.1.2",
-
     "@radix-ui/react-avatar": "^1.1.0",
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.1",
@@ -28,6 +26,7 @@
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@reduxjs/toolkit": "^2.2.7",
+    "@swc/core": "^1.7.35",
     "axios": "^1.7.7",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
@@ -45,12 +44,10 @@
     "react-modal": "^3.16.1",
     "react-redux": "^9.1.2",
     "react-router-dom": "^6.26.2",
-
-    "sonner": "^1.5.0",
-
     "react-slick": "^0.30.2",
     "recharts": "^2.12.7",
     "slick-carousel": "^1.8.1",
+    "sonner": "^1.5.0",
     "tailwind-merge": "^2.5.3",
     "tailwindcss-animate": "^1.0.7"
   },

diff --git a/public/icon/facebook.png b/public/icon/facebook.png
diff --git a/public/icon/instagram.png b/public/icon/instagram.png
diff --git a/public/icon/linkedin.png b/public/icon/linkedin.png
diff --git a/public/icon/x.png b/public/icon/x.png
diff --git a/public/logos/logo.png b/public/logos/logo.png
diff --git a/src/App.jsx b/src/App.jsx
@@ -26,7 +26,8 @@ import Inquiries from './pages/Inquiries';
 import EditProperties from './pages/manage/EditProperties';
 import Buyers from './pages/Buyers/Buyers';
 import PropertyDescription from './pages/Buyers/PropertyDescription';
-import PurchaseSuccessful from './pages/Buyers/purchaseSuccessful';
+// import PurchaseSuccessful from './pages/Buyers/purchaseSuccessful';
+
 
 
 function App() {
@@ -39,7 +40,7 @@ function App() {
           <Routes>
           <Route path='/properties/buyers' element={<Buyers />}/>
           <Route path='/properties/buyers/:id' element={<PropertyDescription />}/>
-          <Route path='/properties/buyers/successful' element={<PurchaseSuccessful />} />
+          {/* <Route path='/properties/buyers/successful' element={<PurchaseSuccessful />} /> */}
           <Route/>
         </Routes>
 
@@ -50,6 +51,7 @@ function App() {
           </Route>
         </Routes>
 
+
         <Routes>
           {/* Authentication Routes */}
           <Route path="/signin" element={<SignIn />} />