Merge branch 'main' of github.com:feliciahmq/orbital-mechhub

package.json

@@ -11,6 +11,8 @@
   },
   "dependencies": {
     "@sendgrid/mail": "^8.1.3",
+    "date-fns": "^3.6.0",
+    "emoji-picker-react": "^4.9.4",
     "firebase": "^10.12.2",
     "firebase-admin": "^12.1.1",
     "node-mailjet": "^6.0.5",
@@ -24,7 +26,8 @@
     "react-router-dom": "^6.23.1",
     "react-slider": "^2.0.6",
     "s": "^1.0.0",
-    "styled-components": "^6.1.11"
+    "styled-components": "^6.1.11",
+    "zustand": "^4.5.2"
   },
   "devDependencies": {
     "@types/react": "^18.2.66",

src/App.jsx

@@ -8,34 +8,38 @@ import LoginSignupForm from "./pages/registration/LoginSignupForm";
 import UserProfile from "./pages/userprofile/UserProfile";
 import SearchPage from "./pages/search/SearchPage";
 import ListingPage from "./pages/listing/Listing";
-import ProductPage from "./pages/viewproduct/ViewProduct";
-import LikesPage from "./pages/likes/Likes";
+import Chat from "./pages/chatapp/ChatApp";
 import ReviewPage from "./pages/review/Review";
 import NotificationsPage from "./pages/notificaiton/Notificaitons";
+import ProductPage from "./pages/viewproduct/ViewProduct";
+import LikesPage from "./pages/likes/Likes";
 
 const App = () => {
-	return (
-		<AuthProvider>
-			<LikeCountProvider>
-				<Toaster />
-				<Router>
-					<Routes>
-						<Route path="/" element={<LandingPage />} />
-						<Route path="/account" element={<LoginSignupForm />} />
-						<Route path="/profile" element={<UserProfile />} />
-						<Route path="/profile/:userID" element={<UserProfile />} />
-						<Route path="/search" element={<SearchPage />} />
-						<Route path="/listing" element={<ListingPage />} />
-						<Route path="/listing/:listingID" element={<ListingPage />} />
-						<Route path="/product/:listingID" element={<ProductPage />} />
-						<Route path="/likes/:userID" element={<LikesPage />} />
-						<Route path="/review/:userID" element={<ReviewPage />} />
-						<Route path="/notifications/:userID" element={<NotificationsPage />} />
-					</Routes>
-				</Router>
-			</LikeCountProvider>
-		</AuthProvider>
-	);
+return (
+	<AuthProvider>
+	<LikeCountProvider>
+
+	<Toaster />
+	<Router>
+		<Routes>
+		<Route path="/" element={<LandingPage />} />
+		<Route path="/account" element={<LoginSignupForm />} />
+		<Route path="/profile" element={<UserProfile />} />
+		<Route path="/profile/:userID" element={<UserProfile />} />
+		<Route path="/search" element={<SearchPage />} />
+		<Route path="/listing" element={<ListingPage />} />
+		<Route path="/listing/:listingID" element={<ListingPage />} />
+		<Route path="/product/:listingID" element={<ProductPage />} />
+		<Route path="/likes/:userID" element={<LikesPage />} />
+		<Route path="/review/:userID" element={<ReviewPage />} />
+		<Route path="/notifications/:userID" element={<NotificationsPage />} />
+		<Route path="/chat" element={<Chat />} />
+		<Route path="/chat/:userID" element={<Chat />} />
+		</Routes>
+	</Router>
+	</LikeCountProvider>
+	</AuthProvider>
+);
 }
 
 export default App;

src/Auth.jsx

@@ -1,23 +1,31 @@
 import React, { createContext, useState, useEffect, useContext } from 'react';
 import { onAuthStateChanged } from 'firebase/auth';
-import { auth } from './firebase/firebaseConfig';
+import { auth } from './lib/firebaseConfig';
+import { useUserStore } from '/src/lib/userStore'; 
 
 const AuthContext = createContext();
 
 export const useAuth = () => useContext(AuthContext);
 
 export const AuthProvider = ({ children }) => {
+    const { fetchUserInfo } = useUserStore();
     const [currentUser, setCurrentUser] = useState(null);
 
     useEffect(() => {
         const unsubscribe = onAuthStateChanged(auth, (user) => {
-            setCurrentUser(user);
+            if (user) {
+                setCurrentUser(user);
+                fetchUserInfo(user.uid);
+            } else {
+                setCurrentUser(null);
+                fetchUserInfo(null);
+            }
         });
         return unsubscribe;
-    }, []);
+    }, [fetchUserInfo]);
 
     return (
-        <AuthContext.Provider value={{ currentUser }}>
+        <AuthContext.Provider value={{ currentUser, useUserStore }}>
             {children}
         </AuthContext.Provider>
     );