diff --git a/index.html b/index.html index 252f181..74b433c 100644 --- a/index.html +++ b/index.html @@ -4,11 +4,12 @@ + - React App + GDSC AEC diff --git a/package-lock.json b/package-lock.json index 96e0d2b..ff3c00a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1023,9 +1023,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001555", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001555.tgz", - "integrity": "sha512-NzbUFKUnJ3DTcq6YyZB6+qqhfD112uR3uoEnkmfzm2wVzUNsFkU7AwBjKQ654Sp5cau0JxhFyRSn/tQZ+XfygA==", + "version": "1.0.30001557", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001557.tgz", + "integrity": "sha512-91oR7hLNUP3gG6MLU+n96em322a8Xzes8wWdBKhLgUoiJsAF5irZnxSUCbc+qUZXNnPCfUwLOi9ZCZpkvjQajw==", "dev": true, "funding": [ { diff --git a/src/assets/coreTeamPictures/Aditya Shaw.png b/src/assets/coreTeamPictures/Aditya Shaw.png index 034652d..e1034d4 100644 Binary files a/src/assets/coreTeamPictures/Aditya Shaw.png and b/src/assets/coreTeamPictures/Aditya Shaw.png differ diff --git a/src/assets/coreTeamPictures/Bikash Agawala.png b/src/assets/coreTeamPictures/Bikash Agarwala.png similarity index 100% rename from src/assets/coreTeamPictures/Bikash Agawala.png rename to src/assets/coreTeamPictures/Bikash Agarwala.png diff --git a/src/assets/coreTeamPictures/MD AMIR KHAN.png b/src/assets/coreTeamPictures/Md Amir Khan.png similarity index 100% rename from src/assets/coreTeamPictures/MD AMIR KHAN.png rename to src/assets/coreTeamPictures/Md Amir Khan.png diff --git a/src/assets/coreTeamPictures/Moulina Pandey.png b/src/assets/coreTeamPictures/Moulina Panday.png similarity index 100% rename from src/assets/coreTeamPictures/Moulina Pandey.png rename to src/assets/coreTeamPictures/Moulina Panday.png diff --git a/src/assets/coreTeamPictures/Niraj Modi.PNG b/src/assets/coreTeamPictures/Niraj Modi.png similarity index 100% rename from src/assets/coreTeamPictures/Niraj Modi.PNG rename to src/assets/coreTeamPictures/Niraj Modi.png diff --git a/src/assets/coreTeamPictures/rajdipSinha.png b/src/assets/coreTeamPictures/Rajdip Sinha.png similarity index 100% rename from src/assets/coreTeamPictures/rajdipSinha.png rename to src/assets/coreTeamPictures/Rajdip Sinha.png diff --git a/src/assets/dp.png b/src/assets/dp.png deleted file mode 100644 index 6a50a61..0000000 Binary files a/src/assets/dp.png and /dev/null differ diff --git a/src/components/marqueeCards/Marquee.jsx b/src/components/marqueeCards/Marquee.jsx index 9d286f2..0199772 100644 --- a/src/components/marqueeCards/Marquee.jsx +++ b/src/components/marqueeCards/Marquee.jsx @@ -2,12 +2,18 @@ import Marquee from "react-fast-marquee"; const MarqueeCards = ({ children, direction }) => { const containerStyle = {}; + const gradientWidthCalc = () => { + const width = window.innerWidth; + if (width > 1024) return 400; + if (width > 768) return 200; + return 50; + }; return ( diff --git a/src/components/team/Card.jsx b/src/components/team/Card.jsx index 0928d48..8f370e3 100644 --- a/src/components/team/Card.jsx +++ b/src/components/team/Card.jsx @@ -8,10 +8,10 @@ export default function Card({ twitter, colour, }) { - console.log(image); - console.log(colour); + // console.log(image); + // console.log(colour); const className = `flex flex-col m-6 justify-center gap-2 items-center shadow-[0px_0px_15px_2px_rgba(0,0,0,0.17)] border-b-8 border-b-[${colour}] border-solid - w-[18rem] h-[22rem] shrink-0`; + w-[18rem] h-[22rem] shrink-0 rounded-[1rem]`; return (
diff --git a/src/data/data2023.json b/src/data/data2023.json index 98b21e2..95ad61f 100644 --- a/src/data/data2023.json +++ b/src/data/data2023.json @@ -7,7 +7,8 @@ "githubUrl": "https://github.com/TheCodeVenturer", "twitterUrl": "https://twitter.com/TheCodeVenturer", "websiteUrl": "https://thecodeventurer.github.io/", - "roleType": 1 + "roleType": 1, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Niraj%20Modi.png" }, { "name": "Jayanta Pandit", @@ -16,7 +17,8 @@ "githubUrl": "https://github.com/jayzsh", "twitterUrl": "https://x.com/74HSALAK", "websiteUrl": "https://jayantapandit.me", - "roleType": 2 + "roleType": 2, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Jayanta%20Pandit.png" }, { "name": "Bishal Bhattacharjee", @@ -25,7 +27,8 @@ "githubUrl": "https://github.com/Bishal097", "twitterUrl": "https://twitter.com/Code_by_Bishal", "websiteUrl": "", - "roleType": 2 + "roleType": 2, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Bishal%20Bhattacharjee.png" }, { "name": "Anirban Sinha", @@ -34,7 +37,8 @@ "githubUrl": "https://github.com/anirban6102", "twitterUrl": "", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Anirban%20Sinha.png" }, { "name": "Arnab Chatterjee", @@ -43,16 +47,18 @@ "githubUrl": "https://github.com/ArnabChatterjee20k", "twitterUrl": "https://twitter.com/arnabch20k", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Arnab%20Chatterjee.png" }, { - "name": "Moulina Panday ", + "name": "Moulina Panday", "role": "AI/ML Lead", "linkedinUrl": "https://www.linkedin.com/in/moulina-panday-460590215/", "githubUrl": "https://github.com/PandayMoulina", "twitterUrl": "https://twitter.com/Moulina_Panday", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Moulina%20Panday.png" }, { "name": "Aditya Shaw", @@ -61,7 +67,8 @@ "githubUrl": "https://github.com/AdityaShaw1", "twitterUrl": "https://x.com/Aditya_Shaw_1?t=XH2mWEPwJ_uGWzXGSPaO-g&s=09", "websiteUrl": "https://portfolioadi.super.site/", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Aditya%20Shaw.png" }, { "name": "Md Amir Khan", @@ -70,7 +77,8 @@ "githubUrl": "https://github.com/aamiiir", "twitterUrl": "https://x.com/aamiiiiiiiirrr?s=21", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Md%20Amir%20Khan.png" }, { "name": "Rounak Kayal", @@ -79,7 +87,8 @@ "githubUrl": "https://github.com/rk2003kayal", "twitterUrl": "", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Rounak%20Kayal.png" }, { "name": "Riya Kumari", @@ -88,16 +97,18 @@ "githubUrl": "https://github.com/CSERiya", "twitterUrl": "", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Riya%20Kumari.png" }, { - "name": "GOURAV RAJAK", + "name": "Gourav Rajak", "role": "AI/ML Facilitator", "linkedinUrl": "https://www.linkedin.com/in/gourav-rajak-012947242/", "githubUrl": "", "twitterUrl": "", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Gourav%20Rajak.png" }, { "name": "Rajdip Sinha", @@ -107,7 +118,7 @@ "twitterUrl": "https://x.com/rajdips834?t=K0E58jxs0sleVQUDzLAvjw&s=09", "websiteUrl": "", "roleType": 3, - "image":"../../assets/coreTeamPictures/rajdipSinha.png" + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Rajdip%20Sinha.png" }, { "name": "Shivam kumar shaw", @@ -116,7 +127,8 @@ "githubUrl": "https://github.com/shivamshaw07", "twitterUrl": "https://x.com/shivamshaw007?t=KXNC-AeZDDKuI9KwfW1gsQ&s=08", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Shivam%20Kumar%20Shaw.png" }, { "name": "Bikash Agarwala", @@ -125,16 +137,18 @@ "githubUrl": "https://github.com/Bikash-Agrawala", "twitterUrl": "", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Bikash%20Agarwala.png" }, { - "name": "Bhumi Sinha ", + "name": "Bhumi Sinha", "role": "Content Writer", "linkedinUrl": "https://www.linkedin.com/in/bhumi-sinha-ba4aab258?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=android_app", "githubUrl": "https://github.com/BHUMISINHA18", "twitterUrl": "https://x.com/Bhumisinha__?t=TtMv_bZOYjBk44L9bP1D7w&s=09", "websiteUrl": "", - "roleType": 3 + "roleType": 3, + "image":"https://raw.githubusercontent.com/gdsc-aec-india/GDSCAEC-WEBSITE/main/src/assets/coreTeamPictures/Bhumi%20Sinha.png" } ], "events": [