From d39d28179b32d9f91be1e4c98ba516bda80977ae Mon Sep 17 00:00:00 2001 From: EkalavyanS Date: Tue, 30 Apr 2024 16:35:29 +0530 Subject: [PATCH 1/5] create(): Created Roadmap Page --- src/App.js | 3 +- src/Components/Navbar/Mylinks.jsx | 36 ++++++++++++------- .../Events/BuildForTeam/BuildForTeam.jsx | 3 +- src/Pages/Roadmap/Roadmap.jsx | 18 ++++++++++ 4 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 src/Pages/Roadmap/Roadmap.jsx diff --git a/src/App.js b/src/App.js index 84c03e7c7..2a1e5a1f3 100644 --- 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() { } /> } /> } /> + } /> } /> } /> } /> } /> } /> } /> - } /> diff --git a/src/Components/Navbar/Mylinks.jsx b/src/Components/Navbar/Mylinks.jsx index c35a25576..a8056ada8 100644 --- 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 index 54aa9fa46..e445b72b4 100644 --- a/src/Pages/Events/BuildForTeam/BuildForTeam.jsx +++ b/src/Pages/Events/BuildForTeam/BuildForTeam.jsx @@ -56,7 +56,8 @@ const Build4Team = () => { Join Whatsapp Group - */} + + */} + + + + ); +} + +export default Roadmap; From fe2046c86655fe17c9c26899893bf2bc3c54175b Mon Sep 17 00:00:00 2001 From: Awindsr Date: Wed, 15 May 2024 00:09:30 +0530 Subject: [PATCH 2/5] fix(footer): Corrected Instagram link to ensure proper redirection. --- src/Components/Footer/Footer.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Footer/Footer.jsx b/src/Components/Footer/Footer.jsx index d6702302b..6096cfc7c 100644 --- a/src/Components/Footer/Footer.jsx +++ b/src/Components/Footer/Footer.jsx @@ -70,7 +70,7 @@ const Footer = () => { /> From 3a2d65fc834ebdbbf11259c5d6af791bb6caa563 Mon Sep 17 00:00:00 2001 From: Awindsr Date: Wed, 15 May 2024 01:36:42 +0530 Subject: [PATCH 3/5] fix(ISR): Prevent infinite API calls by triggering fetchData only on component mount --- src/Pages/Events/ISR/ISR.jsx | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Pages/Events/ISR/ISR.jsx b/src/Pages/Events/ISR/ISR.jsx index b67104258..cb10dc260 100644 --- 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(); // Call the fetchData function when the component mounts + }, []); const ReadMore = ({ children }) => { const text = children From ae42dd5c0a950b400223f8feb1dbe18d00dd5fb7 Mon Sep 17 00:00:00 2001 From: Awindsr Date: Wed, 15 May 2024 08:57:24 +0530 Subject: [PATCH 4/5] fix(isr): fixed the infinite api call bug and issue with read more button --- src/Pages/Events/ISR/ISR.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/Events/ISR/ISR.jsx b/src/Pages/Events/ISR/ISR.jsx index cb10dc260..074760890 100644 --- a/src/Pages/Events/ISR/ISR.jsx +++ b/src/Pages/Events/ISR/ISR.jsx @@ -21,7 +21,7 @@ const ISR = () => { } }; - fetchData(); // Call the fetchData function when the component mounts + fetchData(); }, []); const ReadMore = ({ children }) => { From e8d07e1201f91f2bf49583cbe43b1cb90b72c5a2 Mon Sep 17 00:00:00 2001 From: Awindsr Date: Wed, 15 May 2024 10:06:04 +0530 Subject: [PATCH 5/5] fix(Teams): fixed filtering bug for Enablers HQ category Previously, the filtering for enablers hq category was not working due to a typo error. Corrected the issue and the filtering now works for Enablers HQ category --- src/Pages/Teams/Teams.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/Teams/Teams.jsx b/src/Pages/Teams/Teams.jsx index cb9ccf7f9..1d54e3994 100644 --- a/src/Pages/Teams/Teams.jsx +++ b/src/Pages/Teams/Teams.jsx @@ -67,7 +67,7 @@ const Teams = () => { - +