Merge pull request #1109 from gtech-mulearn/old-dev

Old dev
gtech-mulearn · May 15, 2024 · b195e12 · b195e12
2 parents 5bc9adc + 26c8bba
commit b195e12
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 30 deletions.
diff --git a/src/App.js b/src/App.js
@@ -14,6 +14,7 @@ import Career from "./Pages/Career/Career";
 import LeaderBoard from "./Pages/LeaderBoard/leaderBoard";
 import WikiSyllabus from "./Pages/WikiSyllabus/WikiSyllabus";
 import HacktoberFest from "./Pages/Events/HacktoberFest/HacktoberFest";
+import Roadmap from "./Pages/Roadmap/Roadmap";
 // import Yip from "./Pages/YIP/Yip";
 import CampusChapters from "./Pages/CampusChapters/CampusChapters";
 import BlogLanding from "./Pages/CampusChapters/Blogs/BlogLanding";
@@ -116,13 +117,13 @@ function App() {
             <Route path="/community-partners" element={<CommunityPartner />} />
             <Route path="/artofteaching" element={<ArtOfTeaching />} />
             <Route path="/wikisyllabus" element={<WikiSyllabus />} />
+            <Route path="/roadmap" element={<Roadmap />} />
             <Route path="/yip" element={<YIP2023 />} />
             <Route path="/events/bewebdev" element={<BeWebDev />} />
             <Route path="events/gta/codestorm" element={<CodeStorm />} />
             <Route path="events/learningfest" element={<KKEMLearningFest />} />
             <Route path="/keralatechfest" element={<KKEMLearningFest />} />
             <Route path="/maveliportfolio" element={<MaveliPortfolio />} />
-
             <Route path="/team">
               <Route path="" element={<Teams />} />
             </Route>

diff --git a/src/Components/Footer/Footer.jsx b/src/Components/Footer/Footer.jsx
@@ -70,7 +70,7 @@ const Footer = () => {
               />
             </a>
             <a
-              href="http://www.instagram.com/gtechmulearn/"
+              href="https://www.instagram.com/mulearn.official/"
               target="_blank"
               rel="noopener noreferrer"
             >

diff --git a/src/Components/Navbar/Mylinks.jsx b/src/Components/Navbar/Mylinks.jsx
@@ -118,6 +118,13 @@ export const links = [
         name: "Others",
         submenu: true,
         sublinks: [
+          {
+            name: "Roadmaps",
+            submenu: false,
+            sublinks: [],
+            link: "/roadmap",
+            foreign: false,
+          },
           {
             name: "Magazine",
             submenu: false,
@@ -133,8 +140,6 @@ export const links = [
             foreign: false,
           },
         ],
-
-
       },
     ],
   },
@@ -190,14 +195,7 @@ export const links = [
             link: "https://launchpadkerala.org/",
             foreign: true,
           },
-          {
-            name: "in50hours",
-            submenu: false,
-            sublinks: [],
-            link: "/in50hours",
-            foreign: false,
-          }
-
+          ,
         ],
       },
       {
@@ -568,7 +566,7 @@ export const links = [
             submenu: false,
             sublinks: [],
             foreign: true,
-          }
+          },
         ],
       },
       {
@@ -582,7 +580,7 @@ export const links = [
             submenu: false,
             sublinks: [],
             foreign: false,
-          }
+          },
         ],
       },
     ],
@@ -732,6 +730,20 @@ export function getLinks(ig = []) {
               link: "/artofteaching",
               foreign: false,
             },
+            {
+              name: "Top100 Coders",
+              submenu: false,
+              sublinks: [],
+              link: "https://top100coders.com/",
+              foreign: true,
+            },
+            {
+              name: "IEEE Launchpad",
+              submenu: false,
+              sublinks: [],
+              link: "https://launchpadkerala.org/",
+              foreign: true,
+            }
           ],
         },
         {

diff --git a/src/Pages/Events/BuildForTeam/BuildForTeam.jsx b/src/Pages/Events/BuildForTeam/BuildForTeam.jsx
@@ -56,7 +56,8 @@ const Build4Team = () => {
                     Join Whatsapp Group
                   </button>
                 </a>
-              </div> */}
+              </div> 
+              */}
             </div>
             <img
               src="/assets/events/build4team/fvimgr.gif"

diff --git a/src/Pages/Events/ISR/ISR.jsx b/src/Pages/Events/ISR/ISR.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react"
+import React, { useState, useEffect } from "react"
 import styles from "./ISR.module.css"
 
 import fvimg from "./assets/fvimg.gif"
@@ -10,19 +10,19 @@ import axios from "axios"
 const ISR = () => {
   const [isrData, setisrData] = useState([])
   const [error, setError] = useState()
-  axios
-    .get(
-      "https://opensheet.elk.sh/1r5Pav8TlUEao_9GuMcFasKUEPSDIJOPB9PXKbt4KlTQ/isrcsv"
-    )
-    .then((response) => {
-      setisrData(response.data)
-    })
-    .catch((error) => {
-      console.log(error)
-      setError(
-        "We are currently facing some difficulties in fetching the data at the moment, will be back soon."
-      )
-    })
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        const response = await axios.get("https://opensheet.elk.sh/1r5Pav8TlUEao_9GuMcFasKUEPSDIJOPB9PXKbt4KlTQ/isrcsv");
+        setisrData(response.data);
+      } catch (error) {
+        console.error(error);
+        setError("We are currently facing some difficulties in fetching the data at the moment, will be back soon.");
+      }
+    };
+
+    fetchData(); 
+  }, []);
 
   const ReadMore = ({ children }) => {
     const text = children

diff --git a/src/Pages/Roadmap/Roadmap.jsx b/src/Pages/Roadmap/Roadmap.jsx
@@ -0,0 +1,18 @@
+import React from "react";
+import Navbar from "../../Components/Navbar/Navbar";
+
+function Roadmap() {
+  return (
+    <div>
+      <Navbar />
+      <iframe
+        src="https://roadmap.sh/r/embed?id=662f482233b0bd83e7382e2a"
+        width="100%"
+        height="500px"
+        frameBorder="0"
+      ></iframe>
+    </div>
+  );
+}
+
+export default Roadmap;
diff --git a/src/Pages/Teams/Teams.jsx b/src/Pages/Teams/Teams.jsx
@@ -67,7 +67,7 @@ const Teams = () => {
             <option value="execom">Execom</option>
             <option value="mulearnhq">µLearn HQ</option>
             <option value="associates">Associates</option>
-            <option value="enablershq">Enablers HQ</option>
+            <option value="enablerhq">Enablers HQ</option>
             <option value="mulearnpillar3">µLearn Pillars Q3</option>
             <option value="mulearnpillar1">µLearn Pillars Q1</option>
             <option value="communityteam">Community Team</option>