Skip to content

Commit d8111cf

Browse files
GenDeltaGenDelta
committed
chore: replaced placeholder data with real data and removed skew button from UI
1 parent 6b5f359 commit d8111cf

File tree

10 files changed

+136
-51
lines changed

10 files changed

+136
-51
lines changed

‎src/assets/images/Core/BoscoChanam.jpg‎

132 KB
Loading

src/assets/images/Core/GarretFernandez.jpg renamed to src/assets/images/Core/GarretFernandes.jpg

File renamed without changes.

src/assets/images/Core/Pramit Sharma.jpg renamed to src/assets/images/Core/PramitSharma.jpg

File renamed without changes.

‎src/assets/images/Core/RupaliGangarde.jpg‎

57.8 KB
Loading

‎src/assets/images/Core/SehajSaluja.jpg‎

42 KB
Loading

src/assets/images/Core/Shraddha Bhaskar.jpg renamed to src/assets/images/Core/ShraddhaBhaskar.jpg

File renamed without changes.

‎src/components/AboutUs/index.jsx‎

Lines changed: 63 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,68 @@
1-
import { Link } from 'react-router-dom';
1+
import { Link } from "react-router-dom";
22
import Marquee from "react-fast-marquee";
33
import Card from "@/components/Card";
44

55
export default function AboutSection() {
66
const images1 = [
7-
{ src: "src/assets/images/AIML_SESSION/Copy of IMG_20231014_101836310.jpg", id: "image1-1" },
8-
{ src: "src/assets/images/Community_Session/Copy of 20240224_103259AMByGPSMapCamera.jpg", id: "image1-2" },
9-
{ src: "src/assets/images/Gen_AI_Session/Copy of 20240203_21709PMByGPSMapCamera.jpg", id: "image1-3" },
10-
{ src: "src/assets/images/HackTober_Fest/Copy of file_2023-09-30_08.20.07.png", id: "image1-4" },
11-
{ src: "src/assets/images/Laser_Lock/Copy of Copy of IMG_20230920_124854067.jpg", id: "image1-5" },
12-
{ src: "src/assets/images/RUST_SESSION/Copy of IMG_1808.JPG", id: "image1-6" },
13-
{ src: "src/assets/images/AIML_SESSION/Copy of 20231014_101538AMByGPSMapCamera.jpg", id: "image1-7" },
7+
{
8+
src: "src/assets/images/AIML_SESSION/Copy of IMG_20231014_101836310.jpg",
9+
id: "image1-1",
10+
},
11+
{
12+
src: "src/assets/images/Community_Session/Copy of 20240224_103259AMByGPSMapCamera.jpg",
13+
id: "image1-2",
14+
},
15+
{
16+
src: "src/assets/images/Gen_AI_Session/Copy of 20240203_21709PMByGPSMapCamera.jpg",
17+
id: "image1-3",
18+
},
19+
{
20+
src: "src/assets/images/HackTober_Fest/Copy of file_2023-09-30_08.20.07.png",
21+
id: "image1-4",
22+
},
23+
{
24+
src: "src/assets/images/Laser_Lock/Copy of Copy of IMG_20230920_124854067.jpg",
25+
id: "image1-5",
26+
},
27+
{
28+
src: "src/assets/images/RUST_SESSION/Copy of IMG_1808.JPG",
29+
id: "image1-6",
30+
},
31+
{
32+
src: "src/assets/images/AIML_SESSION/Copy of 20231014_101538AMByGPSMapCamera.jpg",
33+
id: "image1-7",
34+
},
1435
];
1536

1637
const images2 = [
17-
{ src: "src/assets/images/Community_Session/Copy of 20240224_104111amByGPSMapCamera.jpg", id: "image2-1" },
18-
{ src: "src/assets/images/Gen_AI_Session/Copy of 20240203_25946PMByGPSMapCamera.jpg", id: "image2-2" },
19-
{ src: "src/assets/images/HackTober_Fest/Copy of Technology in Education Technology Presentation in Blue Peach Illustrative Style (LinkedIn Post)-03.jpeg", id: "image2-3" },
20-
{ src: "src/assets/images/Laser_Lock/Copy of IMG_0579~2.jpg", id: "image2-4" },
21-
{ src: "src/assets/images/HackTober_Fest/Copy of file_2023-09-30_08.20.27.png", id: "image2-5" },
22-
{ src: "src/assets/images/AIML_SESSION/Copy of IMG_20231014_102758812.jpg", id: "image2-6" },
23-
{ src: "src/assets/images/Laser_Lock/Copy of IMG_20230920_150650428.jpg", id: "image2-7" },
38+
{
39+
src: "src/assets/images/Community_Session/Copy of 20240224_104111amByGPSMapCamera.jpg",
40+
id: "image2-1",
41+
},
42+
{
43+
src: "src/assets/images/Gen_AI_Session/Copy of 20240203_25946PMByGPSMapCamera.jpg",
44+
id: "image2-2",
45+
},
46+
{
47+
src: "src/assets/images/HackTober_Fest/Copy of Technology in Education Technology Presentation in Blue Peach Illustrative Style (LinkedIn Post)-03.jpeg",
48+
id: "image2-3",
49+
},
50+
{
51+
src: "src/assets/images/Laser_Lock/Copy of IMG_0579~2.jpg",
52+
id: "image2-4",
53+
},
54+
{
55+
src: "src/assets/images/HackTober_Fest/Copy of file_2023-09-30_08.20.27.png",
56+
id: "image2-5",
57+
},
58+
{
59+
src: "src/assets/images/AIML_SESSION/Copy of IMG_20231014_102758812.jpg",
60+
id: "image2-6",
61+
},
62+
{
63+
src: "src/assets/images/Laser_Lock/Copy of IMG_20230920_150650428.jpg",
64+
id: "image2-7",
65+
},
2466
];
2567

2668
return (
@@ -58,12 +100,12 @@ export default function AboutSection() {
58100
</span>
59101
</p>
60102
<Link to="/about-us">
61-
<button
62-
type="button"
63-
className="absolute -bottom-6 right-0 text-xl underline text-text-aboutuslight hover:text-text-light transition-colors"
64-
>
65-
Know More
66-
</button>
103+
<button
104+
type="button"
105+
className="absolute -bottom-6 right-0 text-xl underline text-text-aboutuslight hover:text-text-light transition-colors"
106+
>
107+
Know More
108+
</button>
67109
</Link>
68110
</div>
69111
</div>

‎src/pages/Teams/TeamMember.jsx‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,35 @@ import { Link } from "react-router-dom";
33
import LinkedInIcon from "@/assets/images/Teams/linkedin.svg";
44
import GithubIcon from "@/assets/images/Teams/github.svg";
55
import InstagramIcon from "@/assets/images/Teams/instagram.svg";
6+
import SakshamGuptaImage from "@/assets/images/Core/SakshamGupta.jpg";
7+
import RupaliGangardeImage from "@/assets/images/Core/RupaliGangarde.jpg";
8+
import SehajSalujaImage from "@/assets/images/Core/SehajSaluja.jpg";
9+
import PramitSharmaImage from "@/assets/images/Core/PramitSharma.jpg";
10+
import ShraddhaBhaskarImage from "@/assets/images/Core/ShraddhaBhaskar.jpg";
11+
import GarretFernandesImage from "@/assets/images/Core/GarretFernandes.jpg";
12+
import BoscoChanamImage from "@/assets/images/Core/BoscoChanam.jpg";
13+
14+
const images = {
15+
1: SakshamGuptaImage,
16+
2: RupaliGangardeImage,
17+
3: SehajSalujaImage,
18+
4: PramitSharmaImage,
19+
5: ShraddhaBhaskarImage,
20+
6: GarretFernandesImage,
21+
7: BoscoChanamImage,
22+
};
623

724
function TeamMember({ member }) {
8-
const { name, position, image, description, linkedin, instagram, github } =
9-
member;
25+
const { name, position, description, linkedin, instagram, github, id } = member;
26+
const image = images[id];
1027

1128
return (
1229
<div className="transition ease-in-out delay-150 hover:-translate-y-1 hover:scale-105 duration-200 hover:drop-shadow-2xl drop-shadow-background cursor-pointer bg-gradient-to-br from-gradient-light to-gradient-dark rounded-3xl shadow-2xl shadow-background overflow-hidden p-2 align-middle max-w-[350px]">
1330
<div className="py-12 border-8xl border-4 h-full border-secondary-light bg-gradient-to-br from-gradient-light to-gradient-dark rounded-3xl overflow-hidden p-3 align-middle">
1431
<img
1532
src={image}
1633
alt={name}
17-
className="w-32 h-32 rounded-full mx-auto"
34+
className="w-32 h-32 rounded-full mx-auto object-cover"
1835
/>
1936
<h2 className="text-xl mt-8 font-poppins font-thin text-center tracking-wide text-text-light">
2037
{name}
@@ -60,11 +77,11 @@ TeamMember.propTypes = {
6077
member: PropTypes.shape({
6178
name: PropTypes.string.isRequired,
6279
position: PropTypes.string.isRequired,
63-
image: PropTypes.string.isRequired,
6480
description: PropTypes.string.isRequired,
6581
linkedin: PropTypes.string.isRequired,
6682
instagram: PropTypes.string.isRequired,
6783
github: PropTypes.string.isRequired,
84+
id: PropTypes.number.isRequired,
6885
}).isRequired,
6986
};
7087

‎src/pages/Teams/index.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import TeamMember from "@/pages/Teams/TeamMember";
2-
import SkewButton from "@/components/SkewButton";
2+
// import SkewButton from "@/components/SkewButton";
33
import Heading from "@/components/Heading/index";
44
import teamMembersData from "./teamsdata.json";
55
import PageTransition from "@/components/PageTransition";
@@ -21,7 +21,7 @@ function Teams() {
2121
<div className="flex flex-row flex-wrap gap-16 justify-center items-center mt-12">
2222
{teamMembers}
2323
</div>
24-
<SkewButton text="SEE ALL" link="/all-members" className="mt-16" />
24+
{/* <SkewButton text="SEE ALL" link="/all-members" className="mt-16" /> */}
2525
</div>
2626
</div>
2727
</div>

‎src/pages/Teams/teamsdata.json‎

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,64 @@
11
[
22
{
3-
"name": "Aditya Desai",
3+
"name": "Saksham Gupta",
44
"position": "PRESIDENT",
5-
"image": "/CodeX-Website/images/teams/Aditya-Desai.jpeg",
6-
"description": "Praesent vestibulum libero non diam Praesent vestibulum libero non diam",
7-
"linkedin": "https://linkedin.com/in/john-doe",
8-
"instagram": "https://instagram.com/john_doe",
9-
"github": "https://github.com/john-doe"
5+
"description": "\"As president, I work to get the best out of my team, stay open to different ideas, and create a strong coding culture in our college.\"",
6+
"linkedin": "https://www.linkedin.com/in/sakshamgupta912/",
7+
"instagram": "https://instagram.com/sakshamgupta__",
8+
"github": "https://github.com/sakshamgupta912",
9+
"id": 1
1010
},
1111
{
1212
"name": "Dr. Rupali Gangarde",
1313
"position": "FACULTY ADVISOR",
14-
"image": "https://media-pnq1-2.cdn.whatsapp.net/v/t61.24694-24/362246050_985287035952930_3222687059276313181_n.jpg?ccb=11-4&oh=01_AdQzhJX4u0dIpMxNBjPYbrW4sfwKKQ4xbLc3kW69swB3Wg&oe=65EA2552&_nc_sid=e6ed6c&_nc_cat=106",
15-
"description": "Praesent vestibulum libero non diam Praesent vestibulum libero non diam",
16-
"linkedin": "https://linkedin.com/in/jane-doe",
17-
"instagram": "https://instagram.com/jane_doe",
18-
"github": "https://github.com/jane-doe"
14+
"description": "\"As the guiding light of Codex Club, I provide mentorship, share insights from my experience, and help our team excel in fostering innovation and collaboration.\"",
15+
"linkedin": "https://www.linkedin.com/in/dr-rupali-gangarde-33aa79121/",
16+
"instagram": "https://instagram.com/rupali.gangarde",
17+
"github": "https://github.com/",
18+
"id": 2
1919
},
2020
{
21-
"name": "Saksham Gupta",
21+
"name": "Sehaj Saluja",
2222
"position": "VICE-PRESIDENT",
23-
"image": "/CodeX-Website/images/teams/Saksham-Gupta.jpeg",
24-
"description": "Praesent vestibulum libero non diam Praesent vestibulum libero non diam",
25-
"linkedin": "https://linkedin.com/in/john-doe",
26-
"instagram": "https://instagram.com/john_doe",
27-
"github": "https://github.com/john-doe"
23+
"description": "\"As the vice-president, I assist in strategic planning, lead initiatives to strengthen our club's vision, and create opportunities for members to thrive.\"",
24+
"linkedin": "https://linkedin.com/in/sehaj-saluja/",
25+
"instagram": "https://instagram.com/sehajsalujaaa",
26+
"github": "https://github.com/sehajsaluja17",
27+
"id": 3
2828
},
2929
{
30-
"name": "Saksham Gupta",
31-
"position": "VICE-PRESIDENT",
32-
"image": "/CodeX-Website/images/teams/Saksham-Gupta.jpeg",
33-
"description": "Praesent vestibulum libero non diam Praesent vestibulum libero non diam",
34-
"linkedin": "https://linkedin.com/in/john-doe",
35-
"instagram": "https://instagram.com/john_doe",
36-
"github": "https://github.com/john-doe"
30+
"name": "Pramit Sharma",
31+
"position": "TECHNICAL HEAD",
32+
"description": "\"As the technical head, I lead our coding initiatives, mentor members in honing their skills, and drive innovation through impactful projects.\"",
33+
"linkedin": "https://linkedin.com/in/pramit-sharma/",
34+
"instagram": "https://instagram.com/pramit.sharma",
35+
"github": "https://github.com/MatricalDefunkt",
36+
"id": 4
37+
},
38+
{
39+
"name": "Shraddha Bhaskar",
40+
"position": "EVENTS HEAD",
41+
"description": "\"As the events head, I plan and organize engaging activities, foster collaboration among members, and bring our club’s vision to life.\"",
42+
"linkedin": "https://linkedin.com/in/shraddha-bhaskar-77a280254/",
43+
"instagram": "https://instagram.com/shraddha.836",
44+
"github": "https://github.com/11sb03",
45+
"id": 5
46+
},{
47+
"name": "Garret Fernandes",
48+
"position": "MEDIA HEAD",
49+
"description": "\"As the media head, I work to highlight our team's achievements, expand our media outreach, and foster a thriving tech community.\"",
50+
"linkedin": "https://linkedin.com/in/garret-fernandez-148809249/",
51+
"instagram": "https://instagram.com/garretfernandezz",
52+
"github": "https://github.com/garretfernandezz",
53+
"id": 6
54+
},
55+
{
56+
"name": "Bosco Chanam",
57+
"position": "TECHNICAL ADVISOR",
58+
"description": "\"As a technical advisor, I aid the technical team with enlightening our members with new skills and technologies.\"",
59+
"linkedin": "https://linkedin.com/in/boscochanam/",
60+
"instagram": "https://instagram.com/boscochanam",
61+
"github": "https://github.com/boscochanam",
62+
"id": 7
3763
}
3864
]

0 commit comments

Comments
 (0)