Merge pull request #965 from Code4GovTech/dev

karntrehan · web-flow · commit 28b12ba84883 · 2024-07-02T14:41:17.000+05:30
API call Fixes
diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -229,143 +229,143 @@ module.exports = {
           items: [
             {
               label: "A2I Bangladesh",
-              to: "/docs/2024/org?id=A2I%20Bangladesh",
+              to: "/docs/2024?id=A2I%20Bangladesh",
             },
             {
               label: "ABDM Enablers",
-              to: "/docs/2024/org?id=ABDM%20Enablers",
+              to: "/docs/2024?id=ABDM%20Enablers",
             },
             {
               label: "Arghyam",
-              to: "/docs/2024/org?id=Arghyam",
+              to: "/docs/2024?id=Arghyam",
             },
             {
               label: "Avanti Fellows",
-              to: "/docs/2024/org?id=Avanti%20Fellows",
+              to: "/docs/2024?id=Avanti%20Fellows",
             },
             {
               label: "Beckn Open Collective",
-              to: "/docs/2024/org?id=Beckn%20Open%20Collective",
+              to: "/docs/2024?id=Beckn%20Open%20Collective",
             },
             {
               label: "Belongg",
-              to: "/docs/2024/org?id=Belongg",
+              to: "/docs/2024?id=Belongg",
             },
             {
               label: "Bhashini",
-              to: "/docs/2024/org?id=Bhashini",
+              to: "/docs/2024?id=Bhashini",
             },
             {
               label: "Blockster Labs/ CREDEBL",
-              to: "/docs/2024/org?id=Blockster%20Labs/%20CREDEBL",
+              to: "/docs/2024?id=Blockster%20Labs/%20CREDEBL",
             },
             {
               label: "ConveGenius AI",
-              to: "/docs/2024/org?id=ConveGenius%20AI",
+              to: "/docs/2024?id=ConveGenius%20AI",
             },
             {
               label: "Dhiway",
-              to: "/docs/2024/org?id=Dhiway",
+              to: "/docs/2024?id=Dhiway",
             },
             {
               label: "eGovernments Foundation",
-              to: "/docs/2024/org?id=eGovernments%20Foundation",
+              to: "/docs/2024?id=eGovernments%20Foundation",
             },
             {
               label: "EkStep Foundation",
-              to: "/docs/2024/org?id=EkStep%20Foundation",
+              to: "/docs/2024?id=EkStep%20Foundation",
             },
             {
               label: "Haqdarshak",
-              to: "/docs/2024/org?id=Haqdarshak",
+              to: "/docs/2024?id=Haqdarshak",
             },
             {
               label: "IDinsight",
-              to: "/docs/2024/org?id=IDinsight",
+              to: "/docs/2024?id=IDinsight",
             },
             {
               label: "MeitY",
-              to: "/docs/2024/org?id=MeitY",
+              to: "/docs/2024?id=MeitY",
             },
             {
               label: "Mojaloop",
-              to: "/docs/2024/org?id=Mojaloop",
+              to: "/docs/2024?id=Mojaloop",
             },
             {
               label: "NSUT in collaboration with C4GT, SEETA, AIC",
-              to: "/docs/2024/org?id=NSUT%20in%20collaboration%20with%20C4GT,%20SEETA,%20AIC",
+              to: "/docs/2024?id=NSUT%20in%20collaboration%20with%20C4GT,%20SEETA,%20AIC",
             },
             {
               label: "Open Function Group",
-              to: "/docs/2024/org?id=Open%20Function%20Group",
+              to: "/docs/2024?id=Open%20Function%20Group",
             },
             {
               label: "Piramal Swasthya Management Research",
-              to: "/docs/2024/org?id=Piramal%20Swasthya%20Management%20Research",
+              to: "/docs/2024?id=Piramal%20Swasthya%20Management%20Research",
             },
             {
               label: "Planet Read",
-              to: "/docs/2024/org?id=Planet%20Read",
+              to: "/docs/2024?id=Planet%20Read",
             },
             {
               label: "PolicyEngine",
-              to: "/docs/2024/org?id=PolicyEngine",
+              to: "/docs/2024?id=PolicyEngine",
             },
             {
               label: "Project Tech4Dev",
-              to: "/docs/2024/org?id=Project%20Tech4Dev",
+              to: "/docs/2024?id=Project%20Tech4Dev",
             },
             {
               label: "Protean",
-              to: "/docs/2024/org?id=Protean",
+              to: "/docs/2024?id=Protean",
             },
             {
               label: "Reap Benefit",
-              to: "/docs/2024/org?id=Reap%20Benefit",
+              to: "/docs/2024?id=Reap%20Benefit",
             },
             {
               label: "SamagraX",
-              to: "/docs/2024/org?id=SamagraX",
+              to: "/docs/2024?id=SamagraX",
             },
             {
               label: "Samanway Foundation",
-              to: "/docs/2024/org?id=Samanway%20Foundation",
+              to: "/docs/2024?id=Samanway%20Foundation",
             },
             {
               label: "Shikshalokam",
-              to: "/docs/2024/org?id=Shikshalokam",
+              to: "/docs/2024?id=Shikshalokam",
             },
             {
               label: "Sugar Labs",
-              to: "/docs/2024/org?id=Sugar%20Labs",
+              to: "/docs/2024?id=Sugar%20Labs",
             },
             {
               label: "Swasth Alliance",
-              to: "/docs/2024/org?id=Swasth%20Alliance",
+              to: "/docs/2024?id=Swasth%20Alliance",
             },
             {
               label: "Tattle",
-              to: "/docs/2024/org?id=Tattle",
+              to: "/docs/2024?id=Tattle",
             },
             {
               label: "Tekdi",
-              to: "/docs/2024/org?id=Tekdi",
+              to: "/docs/2024?id=Tekdi",
             },
             {
               label: "The Mifos Initiative",
-              to: "/docs/2024/org?id=The%20Mifos%20Initiative",
+              to: "/docs/2024?id=The%20Mifos%20Initiative",
             },
             {
               label: "Unicef",
-              to: "/docs/2024/org?id=Unicef",
+              to: "/docs/2024?id=Unicef",
             },
             {
               label: "Zendalona",
-              to: "/docs/2024/org?id=Zendalona",
+              to: "/docs/2024?id=Zendalona",
             },
             {
               label: "Zenysis Technologies",
-              to: "/docs/2024/org?id=Zenysis%20Technologies",
+              to: "/docs/2024?id=Zenysis%20Technologies",
             },
           ]
         }
diff --git a/src/components/IssueDescription.js b/src/components/IssueDescription.js
@@ -58,7 +58,7 @@ function IssueDescription({ currentOrg, currentIssue }) {
                   <li className="breadcrumbs__item">
                     <a
                       className="breadcrumbs__link breadcrumbs-items"
-                      href={`/docs/2024/org?id=${currentOrg}`}
+                      href={`/docs/2024?id=${currentOrg}`}
                     >
                       {currentOrg}
                     </a>
diff --git a/src/components/OrgDescription.js b/src/components/OrgDescription.js
@@ -103,7 +103,7 @@ function OrgDescription({ currentOrg, currentOrgData }) {
                                   <a
                                     className="cursor-pointer"
                                     onClick={() => {
-                                      const newUrl = `/docs/2024/org?id=${currentOrg}&issue=${d.id}`;
+                                      const newUrl = `/docs/2024?id=${currentOrg}&issue=${d.id}`;
                                       history.push(newUrl);
                                     }}
                                   >
diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
@@ -8,6 +8,7 @@ function Sidebar({
   setCurrentOrg,
   currentIssue,
   setCurrentIssue,
+  setCurrentTab
 }) {
   const history = useHistory();
   return (
@@ -18,7 +19,9 @@ function Sidebar({
             <div
               className={`menu__link cursor-pointer ${currentTab == "c4gt" ? "menu__link--active" : ""}`}
               onClick={() => {
-                window.location.href = `/docs/2024/`;
+                const newUrl = `/docs/2024/`;
+                      history.push(newUrl);
+                      setCurrentTab("c4gt")
               }}
             >
               C4GT'24
@@ -36,7 +39,7 @@ function Sidebar({
                   <div
                     className={`menu__list-item-collapsible cursor-pointer ${currentOrg == data?.org_name && currentIssue == null ? "menu__list-item-collapsible--active" : ""}`}
                     onClick={() => {
-                      const newUrl = `/docs/2024/org?id=${data?.org_name}`;
+                      const newUrl = `/docs/2024?id=${data?.org_name}`;
                       history.push(newUrl);
                       setCurrentOrg(() => data?.org_name);
                       setCurrentIssue(() => null);
@@ -74,7 +77,7 @@ function Sidebar({
                               <div
                                 className={`menu__link cursor-pointer ${currentIssue == d.id ? "menu__link--active" : ""}`}
                                 onClick={() => {
-                                  const newUrl = `/docs/2024/org?id=${currentOrg}&issue=${d.id}`;
+                                  const newUrl = `/docs/2024?id=${currentOrg}&issue=${d.id}`;
                                   history.push(newUrl);
                                   setCurrentIssue(() => d.id);
                                 }}
diff --git a/src/pages/docs/2024/index.js b/src/pages/docs/2024/index.js
@@ -1,20 +1,45 @@
 import React, { useEffect, useState } from "react";
 import Layout from "@theme/Layout";
 import "./index.css";
+import { useHistory, useLocation } from "react-router-dom";
 import useParseMarkdown from "../../../hooks/useParseMarkdown";
 import ErrorComponent from "../../../components/ErrorComponent";
 import Sidebar from "../../../components/Sidebar";
 import C4GT2024Description from "../../../components/C4gt2024Description";
+import OrgDescription from "../../../components/OrgDescription";
+import IssueDescription from "../../../components/IssueDescription";
 
 function C4GT2024() {
+  const location = useLocation();
+  const history = useHistory();
   const { API_AUTH_KEY, API_BASE_URL } = useParseMarkdown();
-  const [issueData, setIssueData] = useState(null);
-  const [error, setError] = useState(null);
   const [currentOrg, setCurrentOrg] = useState(null);
   const [currentIssue, setCurrentIssue] = useState(null);
+  const [issueData, setIssueData] = useState(null);
+  const [currentOrgData, setCurrentOrgData] = useState(null);
+  const [currentTab,setCurrentTab] = useState(null)
+  const [error, setError] = useState(null);
 
   useEffect(() => {
     setError(() => null);
+    const queryString = location.search;
+    const urlParams = new URLSearchParams(queryString);
+    const ifOrg = urlParams.get("id") ? urlParams.get("id") : null;
+    const ifIssue = urlParams.get("issue") ? urlParams.get("issue") : null;
+    const newUrl = ifIssue
+      ? `/docs/2024?id=${ifOrg}&issue=${ifIssue}`
+      : ifOrg
+        ? `/docs/2024?id=${ifOrg}`
+        : "/docs/2024/";
+    history.push(newUrl);
+    if (ifIssue) setCurrentIssue(() => ifIssue);
+    else setCurrentIssue(null);
+    if (ifOrg) {setCurrentOrg(() => ifOrg);
+      setCurrentTab("org")
+    }
+    else {setCurrentOrg(null);
+      setCurrentTab("c4gt")
+    }
     fetch(`${API_BASE_URL}/issues`, {
       method: "GET",
       headers: {
@@ -29,13 +54,49 @@ function C4GT2024() {
           throw new Error(`${data?.message}`);
         } else if (data?.error) {
           throw new Error(`${data?.error}`);
-        } else setIssueData(() => data?.issues);
+        } else {
+          let issues = data?.issues;
+          setIssueData(() => issues);
+          if (ifOrg) {
+            setCurrentOrgData(() => {
+              let issue_data = issues?.filter((d, i) => {
+                if (d.org_name == ifOrg) return d.issues;
+                else return;
+              });
+              return issue_data;
+            });
+          } else setCurrentOrgData(null);
+        }
       })
       .catch((error) => {
         setError(() => error);
       });
   }, []);
 
+  useEffect(() => {
+    const queryString = location.search;
+    const urlParams = new URLSearchParams(queryString);
+    const ifOrg = urlParams.get("id") ? urlParams.get("id") : null;
+    const ifIssue = urlParams.get("issue") ? urlParams.get("issue") : null;
+    if (ifIssue) setCurrentIssue(() => ifIssue);
+    else setCurrentIssue(null);
+    if (ifOrg) {
+      setCurrentOrg(() => ifOrg);
+      setCurrentOrgData(() => {
+        let data = issueData?.filter((d, i) => {
+          if (d.org_name == ifOrg) return d.issues;
+          else return;
+        });
+        return data;
+      });
+      setCurrentTab("org")
+    } else {
+      setCurrentOrg(null);
+      setCurrentOrgData(null);
+      setCurrentTab("c4gt")
+    }
+  }, [location]);
+
   return (
     <>
       {error ? (
@@ -47,15 +108,34 @@ function C4GT2024() {
               <aside className="theme-doc-sidebar-container sidebar-container-2024">
                 <Sidebar
                   issueData={issueData}
-                  currentTab={"c4gt"}
+                  currentTab={currentTab}
                   currentOrg={currentOrg}
                   currentIssue={currentIssue}
                   setCurrentIssue={setCurrentIssue}
                   setCurrentOrg={setCurrentOrg}
+                  setCurrentTab={setCurrentTab}
                 />
               </aside>
               <main className="main-container">
+              {currentTab==="c4gt" ? (
                 <C4GT2024Description />
+              ) : currentIssue != null ? (
+                  <IssueDescription
+                    currentOrg={currentOrg}
+                    currentIssue={currentIssue}
+                  />
+                ) : currentOrg != null ? (
+                  <OrgDescription
+                    currentIssue={currentIssue}
+                    setCurrentIssue={setCurrentIssue}
+                    currentOrg={currentOrg}
+                    issueData={issueData}
+                    currentOrgData={currentOrgData}
+                  />
+                ) : (
+                  <></>
+                )}
+                
               </main>
             </div>
           </div>
diff --git a/src/pages/docs/2024/org/index.js b/src/pages/docs/2024/org/index.js

Original file line number	Diff line number	Diff line change
`@@ -229,143 +229,143 @@ module.exports = {`
`229`	`229`	`items: [`
`230`	`230`	`{`
`231`	`231`	`label: "A2I Bangladesh",`
`232`		`- to: "/docs/2024/org?id=A2I%20Bangladesh",`
	`232`	`+ to: "/docs/2024?id=A2I%20Bangladesh",`
`233`	`233`	`},`
`234`	`234`	`{`
`235`	`235`	`label: "ABDM Enablers",`
`236`		`- to: "/docs/2024/org?id=ABDM%20Enablers",`
	`236`	`+ to: "/docs/2024?id=ABDM%20Enablers",`
`237`	`237`	`},`
`238`	`238`	`{`
`239`	`239`	`label: "Arghyam",`
`240`		`- to: "/docs/2024/org?id=Arghyam",`
	`240`	`+ to: "/docs/2024?id=Arghyam",`
`241`	`241`	`},`
`242`	`242`	`{`
`243`	`243`	`label: "Avanti Fellows",`
`244`		`- to: "/docs/2024/org?id=Avanti%20Fellows",`
	`244`	`+ to: "/docs/2024?id=Avanti%20Fellows",`
`245`	`245`	`},`
`246`	`246`	`{`
`247`	`247`	`label: "Beckn Open Collective",`
`248`		`- to: "/docs/2024/org?id=Beckn%20Open%20Collective",`
	`248`	`+ to: "/docs/2024?id=Beckn%20Open%20Collective",`
`249`	`249`	`},`
`250`	`250`	`{`
`251`	`251`	`label: "Belongg",`
`252`		`- to: "/docs/2024/org?id=Belongg",`
	`252`	`+ to: "/docs/2024?id=Belongg",`
`253`	`253`	`},`
`254`	`254`	`{`
`255`	`255`	`label: "Bhashini",`
`256`		`- to: "/docs/2024/org?id=Bhashini",`
	`256`	`+ to: "/docs/2024?id=Bhashini",`
`257`	`257`	`},`
`258`	`258`	`{`
`259`	`259`	`label: "Blockster Labs/ CREDEBL",`
`260`		`- to: "/docs/2024/org?id=Blockster%20Labs/%20CREDEBL",`
	`260`	`+ to: "/docs/2024?id=Blockster%20Labs/%20CREDEBL",`
`261`	`261`	`},`
`262`	`262`	`{`
`263`	`263`	`label: "ConveGenius AI",`
`264`		`- to: "/docs/2024/org?id=ConveGenius%20AI",`
	`264`	`+ to: "/docs/2024?id=ConveGenius%20AI",`
`265`	`265`	`},`
`266`	`266`	`{`
`267`	`267`	`label: "Dhiway",`
`268`		`- to: "/docs/2024/org?id=Dhiway",`
	`268`	`+ to: "/docs/2024?id=Dhiway",`
`269`	`269`	`},`
`270`	`270`	`{`
`271`	`271`	`label: "eGovernments Foundation",`
`272`		`- to: "/docs/2024/org?id=eGovernments%20Foundation",`
	`272`	`+ to: "/docs/2024?id=eGovernments%20Foundation",`
`273`	`273`	`},`
`274`	`274`	`{`
`275`	`275`	`label: "EkStep Foundation",`
`276`		`- to: "/docs/2024/org?id=EkStep%20Foundation",`
	`276`	`+ to: "/docs/2024?id=EkStep%20Foundation",`
`277`	`277`	`},`
`278`	`278`	`{`
`279`	`279`	`label: "Haqdarshak",`
`280`		`- to: "/docs/2024/org?id=Haqdarshak",`
	`280`	`+ to: "/docs/2024?id=Haqdarshak",`
`281`	`281`	`},`
`282`	`282`	`{`
`283`	`283`	`label: "IDinsight",`
`284`		`- to: "/docs/2024/org?id=IDinsight",`
	`284`	`+ to: "/docs/2024?id=IDinsight",`
`285`	`285`	`},`
`286`	`286`	`{`
`287`	`287`	`label: "MeitY",`
`288`		`- to: "/docs/2024/org?id=MeitY",`
	`288`	`+ to: "/docs/2024?id=MeitY",`
`289`	`289`	`},`
`290`	`290`	`{`
`291`	`291`	`label: "Mojaloop",`
`292`		`- to: "/docs/2024/org?id=Mojaloop",`
	`292`	`+ to: "/docs/2024?id=Mojaloop",`
`293`	`293`	`},`
`294`	`294`	`{`
`295`	`295`	`label: "NSUT in collaboration with C4GT, SEETA, AIC",`
`296`		`- to: "/docs/2024/org?id=NSUT%20in%20collaboration%20with%20C4GT,%20SEETA,%20AIC",`
	`296`	`+ to: "/docs/2024?id=NSUT%20in%20collaboration%20with%20C4GT,%20SEETA,%20AIC",`
`297`	`297`	`},`
`298`	`298`	`{`
`299`	`299`	`label: "Open Function Group",`
`300`		`- to: "/docs/2024/org?id=Open%20Function%20Group",`
	`300`	`+ to: "/docs/2024?id=Open%20Function%20Group",`
`301`	`301`	`},`
`302`	`302`	`{`
`303`	`303`	`label: "Piramal Swasthya Management Research",`
`304`		`- to: "/docs/2024/org?id=Piramal%20Swasthya%20Management%20Research",`
	`304`	`+ to: "/docs/2024?id=Piramal%20Swasthya%20Management%20Research",`
`305`	`305`	`},`
`306`	`306`	`{`
`307`	`307`	`label: "Planet Read",`
`308`		`- to: "/docs/2024/org?id=Planet%20Read",`
	`308`	`+ to: "/docs/2024?id=Planet%20Read",`
`309`	`309`	`},`
`310`	`310`	`{`
`311`	`311`	`label: "PolicyEngine",`
`312`		`- to: "/docs/2024/org?id=PolicyEngine",`
	`312`	`+ to: "/docs/2024?id=PolicyEngine",`
`313`	`313`	`},`
`314`	`314`	`{`
`315`	`315`	`label: "Project Tech4Dev",`
`316`		`- to: "/docs/2024/org?id=Project%20Tech4Dev",`
	`316`	`+ to: "/docs/2024?id=Project%20Tech4Dev",`
`317`	`317`	`},`
`318`	`318`	`{`
`319`	`319`	`label: "Protean",`
`320`		`- to: "/docs/2024/org?id=Protean",`
	`320`	`+ to: "/docs/2024?id=Protean",`
`321`	`321`	`},`
`322`	`322`	`{`
`323`	`323`	`label: "Reap Benefit",`
`324`		`- to: "/docs/2024/org?id=Reap%20Benefit",`
	`324`	`+ to: "/docs/2024?id=Reap%20Benefit",`
`325`	`325`	`},`
`326`	`326`	`{`
`327`	`327`	`label: "SamagraX",`
`328`		`- to: "/docs/2024/org?id=SamagraX",`
	`328`	`+ to: "/docs/2024?id=SamagraX",`
`329`	`329`	`},`
`330`	`330`	`{`
`331`	`331`	`label: "Samanway Foundation",`
`332`		`- to: "/docs/2024/org?id=Samanway%20Foundation",`
	`332`	`+ to: "/docs/2024?id=Samanway%20Foundation",`
`333`	`333`	`},`
`334`	`334`	`{`
`335`	`335`	`label: "Shikshalokam",`
`336`		`- to: "/docs/2024/org?id=Shikshalokam",`
	`336`	`+ to: "/docs/2024?id=Shikshalokam",`
`337`	`337`	`},`
`338`	`338`	`{`
`339`	`339`	`label: "Sugar Labs",`
`340`		`- to: "/docs/2024/org?id=Sugar%20Labs",`
	`340`	`+ to: "/docs/2024?id=Sugar%20Labs",`
`341`	`341`	`},`
`342`	`342`	`{`
`343`	`343`	`label: "Swasth Alliance",`
`344`		`- to: "/docs/2024/org?id=Swasth%20Alliance",`
	`344`	`+ to: "/docs/2024?id=Swasth%20Alliance",`
`345`	`345`	`},`
`346`	`346`	`{`
`347`	`347`	`label: "Tattle",`
`348`		`- to: "/docs/2024/org?id=Tattle",`
	`348`	`+ to: "/docs/2024?id=Tattle",`
`349`	`349`	`},`
`350`	`350`	`{`
`351`	`351`	`label: "Tekdi",`
`352`		`- to: "/docs/2024/org?id=Tekdi",`
	`352`	`+ to: "/docs/2024?id=Tekdi",`
`353`	`353`	`},`
`354`	`354`	`{`
`355`	`355`	`label: "The Mifos Initiative",`
`356`		`- to: "/docs/2024/org?id=The%20Mifos%20Initiative",`
	`356`	`+ to: "/docs/2024?id=The%20Mifos%20Initiative",`
`357`	`357`	`},`
`358`	`358`	`{`
`359`	`359`	`label: "Unicef",`
`360`		`- to: "/docs/2024/org?id=Unicef",`
	`360`	`+ to: "/docs/2024?id=Unicef",`
`361`	`361`	`},`
`362`	`362`	`{`
`363`	`363`	`label: "Zendalona",`
`364`		`- to: "/docs/2024/org?id=Zendalona",`
	`364`	`+ to: "/docs/2024?id=Zendalona",`
`365`	`365`	`},`
`366`	`366`	`{`
`367`	`367`	`label: "Zenysis Technologies",`
`368`		`- to: "/docs/2024/org?id=Zenysis%20Technologies",`
	`368`	`+ to: "/docs/2024?id=Zenysis%20Technologies",`
`369`	`369`	`},`
`370`	`370`	`]`
`371`	`371`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ function IssueDescription({ currentOrg, currentIssue }) {`
`58`	`58`	`<li className="breadcrumbs__item">`
`59`	`59`	`<a`
`60`	`60`	`className="breadcrumbs__link breadcrumbs-items"`
`61`		- href={`/docs/2024/org?id=${currentOrg}`}
	`61`	+ href={`/docs/2024?id=${currentOrg}`}
`62`	`62`	`>`
`63`	`63`	`{currentOrg}`
`64`	`64`	`</a>`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ function OrgDescription({ currentOrg, currentOrgData }) {`
`103`	`103`	`<a`
`104`	`104`	`className="cursor-pointer"`
`105`	`105`	`onClick={() => {`
`106`		- const newUrl = `/docs/2024/org?id=${currentOrg}&issue=${d.id}`;
	`106`	+ const newUrl = `/docs/2024?id=${currentOrg}&issue=${d.id}`;
`107`	`107`	`history.push(newUrl);`
`108`	`108`	`}}`
`109`	`109`	`>`