Skip to content

Commit

Permalink
Update team page with new members; update events section
Browse files Browse the repository at this point in the history
  • Loading branch information
seasew committed Sep 29, 2024
1 parent b0c5386 commit 83d7d7f
Show file tree
Hide file tree
Showing 4 changed files with 236 additions and 141 deletions.
35 changes: 35 additions & 0 deletions src/components/team/SmallerProfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React from 'react';
import { FaLinkedinIn, FaRegEnvelope } from 'react-icons/fa';

const SmallerProfile = (props) => {
const { imagePath, name, title, email, linkedin } = props;
return (
<div className="w-24 lg:w-36 ">
<div className="flex flex-col items-center h-fit">
<div className="bg-gradient-to-b from-stardust to-old-gold w-full h-full">
<div className="m-1 bg-dusk">
<img className={`w-36 lg:w-48 mx-auto`} src={imagePath} alt="Profile Image" />
</div>
</div>
<div className="flex flex-col items-center bg-dusk w-full ">
<h2 className="font-display2-bold text-white text-md mb-1 mt-3">{name}</h2>
<h3 className="font-display2 text-sm md:text-md text-white mb-1">{title}</h3>
<div className="flex flex-row items-center gap-2 mb-2">
{email ?
<a href={`mailto:${email}`} target="_blank" rel="noopener noreferrer">
<FaRegEnvelope className="email-icon fill-white hover:fill-stardust" />
</a> :
<span></span>}
{linkedin ?
<a href={`mailto:${email}`} target="_blank" rel="noopener noreferrer">
<FaLinkedinIn className="email-icon fill-white hover:fill-stardust" />
</a> :
<span></span>}
</div>
</div>
</div>
</div>
);
};

export default SmallerProfile;
3 changes: 1 addition & 2 deletions src/pages/Landing.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ const Landing = () => {
</div>
<DividerLine />
<div className="py-8 lg:py-12">
<p className="font-display-bold text-3xl lg:text-5xl text-stardust mb-4 lg:mb-12 text-balance leading-normal">Featured Events</p>
<Calendar />
<p className="font-display-bold text-3xl lg:text-5xl text-stardust mb-4 lg:mb-12 text-balance leading-normal">Upcoming Events</p>
<iframe src="https://calendar.google.com/calendar/embed?src=purpl.purdue%40gmail.com&ctz=America%2FIndiana%2FIndianapolis" className="border-0 w-full h-[400px] md:h-[500px] max-w-[900px] lg:h-[600px] mx-auto mt-4 lg:mt-8" >
</iframe>
<p className="text-white font-display mt-6 text-lg">Can't see the calendar? <a className="hover:text-stardust underline" href="https://calendar.google.com/calendar/embed?src=purpl.purdue%40gmail.com&ctz=America%2FIndiana%2FIndianapolis">Try this link.</a></p>
Expand Down
148 changes: 9 additions & 139 deletions src/pages/Team.js
Original file line number Diff line number Diff line change
@@ -1,143 +1,13 @@
import Banner from '../components/shared/banner/Banner';
import PageWrapper from '../components/shared/PageWrapper';
import Profile from '../components/team/Profile';
import SmallerProfile from '../components/team/SmallerProfile.js';

function Team() {
import teamData from '../static/TeamData.js';

function Team() {
const data = teamData;
const tempProfilePic = "/images/team/pattern_1.jpg";
const imagePath = "/images/team/headshots/original/";
const data = {
major_exec: [
{
imagePath: tempProfilePic,
name: "Kamon Blong",
title: "Co-President",
image1: "DSC03351.jpg", // serious
image2: "DSC03352.jpg", // smiling
//email: "[email protected]",
//linkedin: "https://linkedin.com/johndoe"
},
{
imagePath: tempProfilePic,
name: "Madeline Taylor",
title: "Co-President",
image1: "DSC03317.jpg",
image2: "DSC03319.jpg",
// email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Parth Karande",
title: "Treasurer",
image1: "DSC03341.jpg",
image2: "DSC03337.jpg",
//email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Alejandro Diaz Contreras",
title: "Project Director",
image1: "DSC03294.jpg",
image2: "DSC03293.jpg",
// email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Jonah Nobel",
title: "Test Stand Director",
image1: "DSC03301.jpg",
image2: "DSC03297.jpg",
//email: "[email protected]"
}
],
admin_exec: [
{
imagePath: tempProfilePic,
name: "Jack Bolster",
title: "Marketing Chair",
// email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Alina Li",
title: "Webmaster",
image1: "DSC03309.jpg",
image2: "DSC03308.jpg",
// email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "James Nida",
title: "IT Chair",
image1: "DSC03289.jpg",
image2: "DSC03287.jpg",
//email: "[email protected]"
},
],
project_leads: [
{
imagePath: tempProfilePic,
name: "Kamon Blong",
title: "Turbopump Co-Lead",
image1: "DSC03351.jpg",
image2: "DSC03352.jpg",
//email: "[email protected]"
}, {
imagePath: tempProfilePic,
name: "Forrest Lim",
title: "Turbopump Co-Lead",
//email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Josh Hyatt",
title: "Turbojet Lead",
image1: "DSC03305.jpg",
image2: "DSC03304.jpg",
//email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Indrajeet Nair",
title: "Electric Propulsion Lead",
image1: "DSC03331.jpg",
image2: "DSC03329.jpg",
//email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Dominik Sloup",
title: "Testbed Co-Lead",
image1: "DSC03285.jpg",
image2: "DSC03283.jpg",
//email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "James Nida",
title: "Testbed Co-Lead",
image1: "DSC03289.jpg",
image2: "DSC03287.jpg",
//email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Vincent Fazio",
title: "Teeny-K Lead",
image1: "DSC03335.jpg",
image2: "DSC03334.jpg",
//email: "[email protected]"
},
{
imagePath: tempProfilePic,
name: "Alejandro Diaz Contreras",
title: "HMB Lead",
image1: "DSC03294.jpg",
image2: "DSC03293.jpg",
//email: "[email protected]"
},
]
}

return (
<PageWrapper>
Expand All @@ -162,7 +32,7 @@ function Team() {
{data.major_exec.map((profile, index) => (
<Profile
key={index}
imagePath={profile.image2 ? (imagePath + profile.image2) : tempProfilePic}
imagePath={profile.image2 ? (profile.image2) : tempProfilePic}
name={profile.name}
title={profile.title}
email={profile.email}
Expand All @@ -173,9 +43,9 @@ function Team() {
<p className="text-white font-display-bold text-2xl mt-12 md:mt-16 mb-4">Project Leads</p>
<div className="flex flex-row mx-auto w-full flex-wrap gap-x-4 md:gap-x-8 md:gap-y-8 justify-center">
{data.project_leads.map((profile, index) => (
<Profile
<SmallerProfile
key={index}
imagePath={profile.image2 ? (imagePath + profile.image2) : tempProfilePic}
imagePath={profile.image2 ? (profile.image2) : tempProfilePic}
name={profile.name}
title={profile.title}
email={profile.email}
Expand All @@ -186,9 +56,9 @@ function Team() {
<p className="text-white font-display-bold text-2xl mt-12 md:mt-16 mb-4">Administrative Board</p>
<div className="flex flex-row mx-auto w-full flex-wrap gap-x-4 md:gap-x-8 md:gap-y-8 justify-center">
{data.admin_exec.map((profile, index) => (
<Profile
<SmallerProfile
key={index}
imagePath={profile.image2 ? (imagePath + profile.image2) : tempProfilePic}
imagePath={profile.image2 ? (profile.image2) : tempProfilePic}
name={profile.name}
title={profile.title}
email={profile.email}
Expand Down
Loading

0 comments on commit 83d7d7f

Please sign in to comment.