Fixed api endpoints

Jshot117 · Oct 16, 2024 · 84fa1a9 · 84fa1a9
1 parent 4bd130a
commit 84fa1a9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 7 deletions.
diff --git a/BackEnd/server.js b/BackEnd/server.js
@@ -22,7 +22,7 @@ app.get('/leaderboard', async (req, res) => {
         console.log('A', usersSnapshot)
         const leaderboard = [];
         usersSnapshot.forEach(doc => {
-            leaderboard.push({ id: doc.id, ...doc.data() });
+            leaderboard.push({ id: doc.id, username: doc.data().username, points: doc.data().points });
         });
 
         res.status(200).json({ leaderboard });
@@ -32,6 +32,24 @@ app.get('/leaderboard', async (req, res) => {
     }
 });
 
+app.post('/userInfo', async (req, res) => {
+    const userId = req.body.uid
+    console.log('User ID:', userId);
+
+    try {
+        const userDoc = await db.collection('users').doc(userId).get();
+        console.log(userDoc.data())
+
+        if (!userDoc.exists) {
+            res.status(404).json({ error: 'User not found' });
+        } else {
+            res.status(200).json({ username: userDoc.data().username, badges: userDoc.data().badges, points: userDoc.data().points, streak: userDoc.data().streaks });
+        }
+    } catch (error) {
+        console.error('Error fetching username:', error);
+        res.status(500).json({ error: 'Failed to fetch username' });
+    }
+});
 // Add a health check endpoint
 app.get('/health', (req, res) => {
     res.status(200).send('OK');

diff --git a/FrontEnd/src/components/DashboardHeader.jsx b/FrontEnd/src/components/DashboardHeader.jsx
@@ -13,15 +13,20 @@ const DashboardHeader = ({ handleLogout }) => {
     useEffect(() => {
         const fetchUsername = async () => {
             const user = auth.currentUser;
-            console.log("Current User:", user); // Log current user
+            console.log('Current user:', user);
             if (user) {
                 try {
                     // Call the leaderboard API to fetch users
-                    const response = await axios.get('https://jshot117-backend--3000.prod1.defang.dev/leaderboard');
-                    const data = response.data.leaderboard;
+                    const response = await axios.post('http://localhost:3000/userInfo', {
+                        uid: user.uid
+                    }, {
+                        headers: {
+                            'Content-Type': 'application/json'
+                        }
+                    });
+                    const currentUser = await response.data;
 
                     // Find the current user in the leaderboard data
-                    const currentUser = data.find(userData => userData.id === user.uid);
 
                     if (currentUser) {
                         setUsername(currentUser.username); // Set username if found
@@ -34,7 +39,7 @@ const DashboardHeader = ({ handleLogout }) => {
                 }
             } else {
                 console.log("No user is logged in");
-            }
+            }https://github.com/Jshot117/HackHarvard
             setLoading(false); // Update loading state once the data is fetched
         };
 

diff --git a/FrontEnd/src/components/LeaderBoard.jsx b/FrontEnd/src/components/LeaderBoard.jsx
@@ -14,7 +14,8 @@ export function LeaderBoard() {
 
     const fetchLeaderboard = async () => {
         try {
-            const response = await axios.get('https://jshot117-backend--3000.prod1.defang.dev/leaderboard');
+            console.log('http://localhost:3000/userInfo','https://jshot117-backend--3000.prod1.defang.dev/leaderboard')
+            const response = await axios.get('http://localhost:3000/leaderboard');
             const data = response.data.leaderboard;
             setCurrenUserPoints(data.find(user => user.id === auth.currentUser.uid).points);
             const currentUser = data.find(user => user.id === auth.currentUser.uid);