Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/Sections/Teams/Teams.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import React, { useEffect, useRef } from "react";
import styled from "styled-components";
import { members1, members2 } from "../../constants/constants";
import sc from "../../data/SC.json";
import jcData from "../../data/JC.json";
import advisorsData from "../../data/Advisors.json";
import { allmembers as constantsAll } from "../../constants/constants";
import TeamCard from "./TeamCard";
import Slider from "react-slick";
import { useInView } from "react-intersection-observer";
Expand Down Expand Up @@ -127,6 +130,16 @@ function Teams() {
},
],
};
const jc = Array.isArray(jcData) ? jcData : jcData.info || [];
const members1 = [...(sc || []), ...jc];
const members2 = Array.isArray(advisorsData) ? advisorsData : advisorsData.info || [];
const normalize = (s) => (s || "").toString().replace(/\s+/g, " ").trim().toLowerCase();
const getImageFromConstants = (name) => {
if (!name) return "";
const n = normalize(name);
const found = (constantsAll || []).find((m) => normalize(m.name) === n);
return (found && found.image) || "";
};
return (
<Section>
<Container>
Expand All @@ -140,7 +153,7 @@ function Teams() {
</h2>

<h4 className="text-xl md:text-2xl font-bold pt-8">
Senior and Junior Councils for 2024-25
Senior and Junior Councils for 2025-26
</h4>

<Carousal ref={ref}>
Expand Down Expand Up @@ -168,10 +181,11 @@ function Teams() {
<Carousal ref={ref}>
<Slider ref={sliderRef} {...settings}>
{members2.map((member) => {
const image = member.image && member.image.trim() ? member.image : getImageFromConstants(member.name);
return (
<TeamCard
key={member.name}
image={member.image}
image={image}
name={member.name}
position={member.position}
linkedin={member.linkedin}
Expand Down
74 changes: 37 additions & 37 deletions src/data/Advisors.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

[
{
"image":"",
"image": "",
"name": "Pranav Barthwal",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"twitter": ""
"github": "https://github.com/PranavBarthwal",
"linkedin": "https://www.linkedin.com/in/pranav-barthwal-b1a3631ba",
"instagram": "https://instagram.com/pranavbarthwal_",
"twitter": "https://twitter.com/pranavbarthwal_"
},
{
"image": "",
"name": "Diksha Sharma",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"github": "https://github.com/DikshaDhasmana",
"linkedin": "https://www.linkedin.com/in/diksha-sharma-1650b1258",
"instagram": "",
"twitter": ""
},
Expand All @@ -26,8 +26,8 @@
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"linkedin": "https://www.linkedin.com/in/jyoti-ahuja-331228248",
"instagram": "https://www.instagram.com/_jyoti040",
"twitter": ""
},
{
Expand All @@ -36,67 +36,67 @@
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"twitter": ""
"linkedin": "https://www.linkedin.com/in/prerna-jha-6080a9253",
"instagram": "https://www.instagram.com/_prerna.____",
"twitter": "https://twitter.com/PrernaJha04"
},
{
"image": "",
"name": "Aryan Pillai",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"twitter": ""
"github": "https://github.com/aryanpillai103",
"linkedin": "https://www.linkedin.com/in/aryanpillai/",
"instagram": "https://www.instagram.com/a.pillai_19",
"twitter": "https://twitter.com/a_pillai103"
},
{
"image": "",
"name": "Sahil Tyagi",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"github": "https://github.com/SahilTyagii",
"linkedin": "https://www.linkedin.com/in/sahil-tyagi-b4a02325a/",
"instagram": "https://www.instagram.com/sahil.tyagii/",
"twitter": ""
},
{
"image": "",
"name": "Sujal Gupta",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"github": "https://github.com/sgmna",
"linkedin": "https://www.linkedin.com/in/sujal-gupta-117154247/",
"instagram": "https://www.instagram.com/sujalgupta1214",
"twitter": ""
},
{
"image": "",
"name": "Mokshit Garg",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"twitter": ""
"github": "https://github.com/Mokshit-123",
"linkedin": "https://www.linkedin.com/in/mokshit-garg-283b27247",
"instagram": "https://www.instagram.com/mokshu_123",
"twitter": "https://twitter.com/Mokshit0068"
},
{
"image": "",
"name": "Shivank Kapur",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"twitter": ""
"github": "https://github.com/ShivankK26",
"linkedin": "https://www.linkedin.com/in/shivankkapur",
"instagram": "https://www.instagram.com/Kapur.shivank2",
"twitter": "https://twitter.com/ShivankK26"
},
{
"image": "",
"name": "Yuvan Grover",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"github": "https://github.com/coderyuvan",
"linkedin": "https://www.linkedin.com/in/yuvan-grover-85b03526a",
"instagram": "",
"twitter": ""
},
Expand All @@ -105,18 +105,18 @@
"name": "Jatin Gera",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"instagram": "",
"github": "https://github.com/JatinGera27aug",
"linkedin": "https://www.linkedin.com/in/jatin-gera-27aug",
"instagram": "https://www.instagram.com/jatingera2004?igsh=Z2phNHRtMWJwM3lj",
"twitter": ""
},
{
"image": "",
"name": "Ankur Sharma",
"position": "Advisor",
"team": "",
"github": "",
"linkedin": "",
"github": "https://github.com/ankursagar020",
"linkedin": "https://www.linkedin.com/in/ankur-sharma-674526268?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=android_app",
"instagram": "",
"twitter": ""
},
Expand Down