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/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 = () => { /> 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 - */} + + */} { 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 new file mode 100644 index 000000000..53f7e71cb --- /dev/null +++ b/src/Pages/Roadmap/Roadmap.jsx @@ -0,0 +1,18 @@ +import React from "react"; +import Navbar from "../../Components/Navbar/Navbar"; + +function Roadmap() { + return ( +
+ + +
+ ); +} + +export default Roadmap; 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 = () => { - +