Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Thecodeventurer #26

Merged
merged 4 commits into from
Oct 29, 2023
Merged

Thecodeventurer #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57af36e
Removed dp.jpg"
TheCodeVenturer Oct 29, 2023
2b01f32
Images Updated and Data.json filled with image
TheCodeVenturer Oct 29, 2023
87e0f43
Images Links Added to Teams Card
TheCodeVenturer Oct 29, 2023
6b2eac8
Blur Fixed for Our Team
TheCodeVenturer Oct 29, 2023
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
3 changes: 2 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<link rel="icon" type="image/x-icon" href="./src/assets/gdsc-logo.png">
<meta
name="description"
content="Web site created using create-react-app"
/>
<title>React App</title>
<title>GDSC AEC</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified src/assets/coreTeamPictures/Aditya Shaw.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...ssets/coreTeamPictures/Bikash Agawala.png → ...sets/coreTeamPictures/Bikash Agarwala.png
View file
Open in desktop
File renamed without changes
0 src/assets/coreTeamPictures/MD AMIR KHAN.png → src/assets/coreTeamPictures/Md Amir Khan.png
View file
Open in desktop
File renamed without changes
0 ...ssets/coreTeamPictures/Moulina Pandey.png → ...ssets/coreTeamPictures/Moulina Panday.png
View file
Open in desktop
File renamed without changes
0 src/assets/coreTeamPictures/Niraj Modi.PNG → src/assets/coreTeamPictures/Niraj Modi.png
View file
Open in desktop
File renamed without changes
0 src/assets/coreTeamPictures/rajdipSinha.png → src/assets/coreTeamPictures/Rajdip Sinha.png
View file
Open in desktop
File renamed without changes
Binary file removed src/assets/dp.png
View file
Open in desktop
Binary file not shown.
8 changes: 7 additions & 1 deletion src/components/marqueeCards/Marquee.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<Marquee
style={{ containerStyle }}
direction={direction}
gradient={true}
gradientWidth={500}
gradientWidth={gradientWidthCalc()}
speed={100}
pauseOnHover={true}
>
Expand Down
6 changes: 3 additions & 3 deletions src/components/team/Card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div className={className}>
Expand Down
50 changes: 32 additions & 18 deletions src/data/data2023.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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": [
Expand Down