Merge branch 'main' into bug/description-text-bookmark-section

HimanshuNarware · Jun 13, 2024 · 6095d81 · 6095d81
2 parents 0a8a2ef + 6a19961
commit 6095d81
Show file tree

Hide file tree

Showing 35 changed files with 1,179 additions and 262 deletions.
diff --git a/backend/src/app.js b/backend/src/app.js
@@ -12,7 +12,7 @@ app.use(bodyParser.urlencoded({ extended: true, limit: "50mb" }));
 
 app.use(
   cors({
-     origin: process.env.FRONTEND_URL.replace(/"/g, ""),
+    origin: 'http://localhost:3000',
     credentials: true,
   })
 );

diff --git a/backend/src/controllers/openSourceController.js b/backend/src/controllers/openSourceController.js
@@ -3,31 +3,46 @@ require("dotenv").config();
 
 const addProject = async (req, res) => {
     try {
-        const {projectName, ownerUsername, tags, link, description} = req.body;
+        const { projectName, ownerUsername, tags, link, description } = req.body;
+
+        // Validation
+        if (!projectName || !ownerUsername || !link || !description) {
+            return res.status(400).json({ success: false, errors: ["All fields are required"] });
+        }
+
         const newProject = await OpenSource.create({
             projectName, ownerUsername, tags, link, description
-        })
+        });
 
-        if (!newProject)
-            return res.statsu(401).json({ success: false, errors: ["Issue Adding the Tool"] });
-
-        return res.status(201).json({ success: true });
-    }
-    catch (error) {
-        console.log(error);
+        if (!newProject) {
+            return res.status(401).json({ success: false, errors: ["Issue Adding the Tool"] });
+        }
+
+        return res.status(201).json({ success: true, project: newProject });
+    } catch (error) {
+        console.error(error);
         return res.status(500).json({ success: false, errors: ["Internal Server Error"] });
     }
-}
+};
 
 const fetchAllProjects = async (req, res) => {
     try {
-        const openSourceProjects = await OpenSource.find();
-        return res.status(200).json({ success: true, openSourceProjects: openSourceProjects });
-    }
-    catch (error) {
-        console.log(error);
+        const { page = 1, limit = 10 } = req.query;
+        const openSourceProjects = await OpenSource.find()
+            .skip((page - 1) * limit)
+            .limit(limit);
+
+        const totalProjects = await OpenSource.countDocuments();
+        return res.status(200).json({
+            success: true,
+            openSourceProjects,
+            totalPages: Math.ceil(totalProjects / limit),
+            currentPage: parseInt(page)
+        });
+    } catch (error) {
+        console.error(error);
         return res.status(500).json({ success: false, errors: ["Internal Server Error"] });
     }
-}
+};
 
-module.exports = { addProject, fetchAllProjects };
+module.exports = { addProject, fetchAllProjects };
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -3,13 +3,17 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@fortawesome/free-solid-svg-icons": "^6.5.2",
+    "@fortawesome/react-fontawesome": "^0.2.2",
     "@reduxjs/toolkit": "^1.9.5",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
     "antd": "^5.6.4",
     "aos": "^2.3.4",
-    "axios": "^1.6.1",
+    "axios": "^1.7.2",
     "bootstrap": "^5.3.2",
     "cheerio": "^1.0.0-rc.12",
     "darkmode-js": "^1.5.7",
@@ -18,10 +22,10 @@
     "lottie-react": "^2.4.0",
     "mongodb": "^6.2.0",
     "pagination": "^0.4.6",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-accessible-accordion": "^5.0.0",
     "react-chatbot-kit": "^2.2.2",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.3.1",
     "react-hot-toast": "^2.4.1",
     "react-icons": "^4.12.0",
     "react-paginate": "^8.2.0",

diff --git a/frontend/public/copy-ai.jpg b/frontend/public/copy-ai.jpg
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -30,7 +30,7 @@
 
   gtag('config', 'G-6WS166VH7E');
 </script>
-    <title>DEVLAPS</title>
+    <title>DEVLABS</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/frontend/public/webflow.jpg b/frontend/public/webflow.jpg