restructure the PR list

odysseyiitr · Dec 9, 2022 · 31bc0c6 · 31bc0c6
1 parent f4b8e9e
commit 31bc0c6
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 9 deletions.
diff --git a/frontend/components/mergedRequests.jsx → frontend/components/MergedCard.jsx b/frontend/components/mergedRequests.jsx → frontend/components/MergedCard.jsx
diff --git a/frontend/components/MergedList.jsx b/frontend/components/MergedList.jsx
@@ -0,0 +1,11 @@
+import MergedCard from "./MergedCard";
+
+const MergedList= ({ list, callback }) => {
+    return (
+        list.map((Card, i) => {
+            return <MergedCard Card={Card} key={i} callback={callback} />;
+        })
+    );
+};
+
+export default MergedList;
diff --git a/frontend/components/pendingRequests.jsx → frontend/components/PendingCard.jsx b/frontend/components/pendingRequests.jsx → frontend/components/PendingCard.jsx
@@ -6,11 +6,11 @@ const PendingCard = ({ username, pr_title, pr_repo, pr_branch }) => {
   return (
     <div className="pendingCard" >
       <div className="requestsTop">
-      <p className='top'>{username}/ {pr_repo}/ {pr_branch} -&gt;</p>
-      <p className='top'>{pr_repo}/ master</p>
+        <p className='top'>{username}/ {pr_repo}/ {pr_branch} -&gt;</p>
+        <p className='top'>{pr_repo}/ master</p>
       </div>
       <div className="requestsTitle">
-      <p className='prTitle'>{pr_title}</p>      </div>
+        <p className='prTitle'>{pr_title}</p>      </div>
     </div>
   );
 };

diff --git a/frontend/components/PendingList.jsx b/frontend/components/PendingList.jsx
@@ -0,0 +1,11 @@
+import PendingCard from "./PendingCard";
+
+const PendingList= ({ list, callback }) => {
+    return (
+        list.map((Card, i) => {
+            return <PendingCard Card={Card} key={i} callback={callback} />;
+        })
+    );
+};
+
+export default PendingList;
diff --git a/frontend/pages/profile/index.jsx b/frontend/pages/profile/index.jsx
@@ -1,14 +1,14 @@
 import Profile from "../../components/Profile";
 import { useSession } from "next-auth/react";
 import { useEffect, useState } from "react";
-import ProfileIssues from "../../components/ProfileIssues";
-import RequestsCard from "../../components/pendingRequests";
-import PendingCard from "../../components/pendingRequests";
-import MergedCard from "../../components/mergedRequests";
+import PendingList from "../../components/PendingList";
+import MergedList from "../../components/MergedList";
 
 const axios = require("axios").default;
 
 export default function Home() {
+  const [MergedList, setMergedList] = useState([]);
+  const [PendingList, setPendingList] = useState([]);
   const { data: session } = useSession();
   const [user, setUser] = useState(null);
 
@@ -24,6 +24,34 @@ export default function Home() {
 
     return response;
   };
+
+  const fetchMerged = async () => {
+    const { data } = await axios.get(
+      `${process.env.NEXT_PUBLIC_BACKEND_URL}api/`
+    );
+    let repos = [];
+    data.forEach(async (element) => {
+      var repoInfo = element.issue.split("/");
+      repos = JSON.parse(JSON.stringify(repos));
+      repos.push({
+      });
+      setMergedList(JSON.parse(JSON.stringify(repos)));
+    });
+  };
+  const fetchPending = async () => {
+    const { data } = await axios.get(
+      `${process.env.NEXT_PUBLIC_BACKEND_URL}api/`
+    );
+    let repos = [];
+    data.forEach(async (element) => {
+      var repoInfo = element.issue.split("/");
+      repos = JSON.parse(JSON.stringify(repos));
+      repos.push({
+      });
+      setPendingList(JSON.parse(JSON.stringify(repos)));
+    });
+  };
+
   useEffect(() => {
     if (session)
       fetchUserData().then((response) => {
@@ -56,9 +84,9 @@ export default function Home() {
           </div>
           <div className="split_right">
             <h1 className="request">merged pull requests</h1>
-            <MergedCard />
+            <MergedList list={CardData} callback={fetchMerged} />;
             <h1 className="request">pending pull requests</h1>
-            <PendingCard />
+            <PendingList list={CardData} callback={fetchPending} />;
           </div>
         </div>
       ) : (