Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/summer24' into summ…
Browse files Browse the repository at this point in the history
…er24
  • Loading branch information
Weile-Zheng committed Jul 29, 2024
2 parents ed8f1b8 + 62c6036 commit 6e06fdc
Show file tree
Hide file tree
Showing 70 changed files with 460 additions and 214 deletions.
105 changes: 105 additions & 0 deletions components/currentProjectCard.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
import Image from "next/image";

export default function CurrentProjectCard({ project, basePath }) {
const projectImagePath = `${basePath ? basePath : ''}/images/projects/${project.image}`;
const leadText = project.leads.length > 1 ? "Leads" : "Lead";

return (
<div style={styles.card}>
<div style={{ ...styles.column, ...styles.projectInfo }}>
<Image
style={styles.projectImage}
width="300"
height="300"
src={projectImagePath}
alt={project.label}
/>
<h3 style={styles.projectTitle}>{project.label}</h3>
</div>
<div style={{ ...styles.column, ...styles.leadsInfo }}>
<h4 style={styles.leadText}>{leadText}:</h4>
<div style={styles.leadsContainer}>
{project.leads.map((lead, idx) => (
<div key={idx} style={styles.lead}>
<Image
style={styles.leadImage}
width="75"
height="75"
src={`${basePath ? basePath : ''}/images/team/${lead.image}`}
alt={lead.name}
/>
<p style={styles.leadName}>{lead.name}</p>
</div>
))}
</div>
</div>
</div>
);
}

const styles = {
card: {
display: 'flex',
flexDirection: 'row',
backgroundColor: '#333',
padding: '16px',
borderRadius: '8px',
width: '100%',
maxWidth: '600px',
marginBottom: '32px',
},
column: {
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
width: '100%',
},
projectInfo: {
marginBottom: '16px',
},
projectImage: {
borderRadius: '10%',
objectFit: 'cover',
width: 'auto',
height: '100%',
},
projectTitle: {
marginTop: '16px',
fontSize: '24px',
fontWeight: 'bold',
textAlign: 'center',
},
leadsInfo: {
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
},
leadText: {
fontSize: '20px',
fontWeight: 'bold',
},
leadsContainer: {
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
marginTop: '8px',
gap: '16px',
},
lead: {
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
},
leadImage: {
borderRadius: '50%',
objectFit: 'cover',
width: '75px',
height: '75px',
},
leadName: {
marginTop: '8px',
textAlign: 'center',
fontSize: '14px',
fontWeight: '500',
},
};
15 changes: 6 additions & 9 deletions components/icon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import {
IoBrowsersOutline,
IoLogoSlack,
IoCopyOutline,
IoCalendarOutline
IoCalendarOutline,
IoDocumentTextOutline,
IoDocumentOutline
} from "react-icons/io5";
import { createElement } from "react";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faGoogleDrive } from "@fortawesome/free-brands-svg-icons";

const iconMap = {
envelope: IoMail,
Expand All @@ -33,7 +33,8 @@ const iconMap = {
slack: IoLogoSlack,
copy: IoCopyOutline,
calendar: IoCalendarOutline,
googleSlides: faGoogleDrive,
"file-text": IoDocumentTextOutline,
"file-pdf": IoDocumentOutline
};

export default function Icon({ name, ...props }) {
Expand All @@ -44,9 +45,5 @@ export default function Icon({ name, ...props }) {
return null;
}

if (name === 'googleSlides') {
return <FontAwesomeIcon icon={IconComponent} {...props} />;
}

return createElement(IconComponent, props);
}
}
37 changes: 37 additions & 0 deletions components/projectCard.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import Link from "next/link";
import Image from "next/image";
import Icon from "@/components/icon";

export default function ProjectCard({ project, basePath }) {
const imagePath = `${basePath}/images/projects/${project.label.toLowerCase().split(" ").join("_")}.jpg`;
return (
<div className="text-left sm:text-center rounded bg-grey py-2 sm:py-4 px-2 sm:px-8 w-full sm:w-60 flex sm:block gap-8">
<Image
className="sm:mx-auto sm:mb-4 sm:w-44 sm:h-44 w-24 h-24 my-auto rounded-full object-cover"
width="176"
height="176"
src={imagePath}
alt={project.label}
/>
<div className="">
<h3 className="mb-1 text-2xl font-bold tracking-tight">{project.label}</h3>
<ul className="flex sm:justify-center mt-2 sm:mt-4 space-x-4">
{project.github && (
<li>
<Link href={project.github} className="hover:text-gray" aria-label="Github Repo">
<Icon name="github" className="text-3xl" />
</Link>
</li>
)}
{project.googleSlides && (
<li>
<Link href={project.googleSlides} className="hover:text-gray" aria-label="Google Slides">
<Icon name="file-pdf" className="text-3xl" />
</Link>
</li>
)}
</ul>
</div>
</div>
);
}
92 changes: 92 additions & 0 deletions config/currentProjects.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
[
{
"label": "Economic Forecasting",
"image": "economic_forecasting.jpg",
"leads": [
{ "name": "Jordan Ives", "image": "temp.jpeg" },
{ "name": "Amelia Weyhing", "image": "aweyhing.JPG" }
]
},
{
"label": "Research Grant Analysis",
"image": "research_grant_analysis.jpg",
"leads": [
{ "name": "Erin Alcott", "image": "ealcott.jpg" },
{ "name": "Linda Ru", "image": "clindaru.png" }
]
},
{
"label": "Car Brand Classification",
"image": "car_brand_classification.jpg",
"leads": [
{ "name": "Aditi Kashi", "image": "adikashi.jpg" },
{ "name": "Anish Kudupudi", "image": "temp.jpeg" }
]
},
{
"label": "SoccerNet",
"image": "soccernet.jpg",
"leads": [
{ "name": "Antonio Capdevielle", "image": "temp.jpeg" },
{ "name": "Shiva Chandran", "image": "shivac.jpg" }
]
},
{
"label": "LLM Augmentation",
"image": "llm_augmentation.jpg",
"leads": [
{ "name": "Aditya Murali", "image": "temp.jpeg" },
{ "name": "Jordan Jones", "image": "jordanrj.jpeg" }
]
},
{
"label": "Facial Recognition",
"image": "facial_recognition.jpg",
"leads": [
{ "name": "Andrew Black", "image": "andbl.jpeg" },
{ "name": "Judith Wu", "image": "temp.jpeg" }
]
},
{
"label": "RL Neuroevolution",
"image": "reinforcement_learning.jpg",
"leads": [
{ "name": "Luke Yang", "image": "lukeyang.jpeg" },
{ "name": "Nathan Kawamoto", "image": "temp.jpeg" }
]
},
{
"label": "Mining & Analyzing Tweets",
"image": "twitter_sentiment_analysis.jpg",
"leads": [
{ "name": "Nidhil Nayudu", "image": "temp.jpeg" },
{ "name": "Tiernan Jesrani", "image": "tiernanj.jpg" }
]
},
{
"label": "ViT From Scratch",
"image": "vit_from_scratch.jpg",
"leads": [
{ "name": "Anthony Chen", "image": "anthoc.jpeg" },
{ "name": "Matthew Drutis", "image": "madrutis.jpg" }
]
},
{
"label": "Mini Copilot",
"image": "mini_copilot.jpg",
"leads": [
{ "name": "Amirali Danai", "image": "amiralid.png" },
{ "name": "Nishant Dash", "image": "temp.jpeg" }
]
},
{
"label": "Poker Bot",
"image": "poker_bot.jpg",
"leads": [
{ "name": "Jason Yen", "image": "temp.jpeg" },
{ "name": "Onat Ozer", "image": "temp.jpeg" },
{ "name": "Adita Sinha", "image": "temp.jpeg" }
]
}
]

76 changes: 0 additions & 76 deletions config/ourteam.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,81 +206,5 @@
"image": "taylornl.png"
}
]
},
{
"groupName": "Project Leads",
"description": "Individuals who spearhead specific projects within MDST, ensuring successful execution from inception to completion. They coordinate team efforts, manage timelines, and serve as the primary point of contact for their respective projects. Led by the VP of Projects.",
"members": [
{
"name": "Anthony Chen",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/anthony-chen0?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
"image": "anthoc.jpeg"
},
{
"name": "Erin Alcott",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/erin-alcott/",
"image": "ealcott.jpg"
},
{
"name": "Andrew Black",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/andrew-c-black/",
"image": "andbl.jpeg"
},
{
"name": "Shiva Chandran",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/shiva-chandran-215434268",
"image": "shivac.jpg"
},
{
"name": "Matthew Drutis",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/matthew-drutis/",
"github": "https://madrutis.github.io/",
"image": "madrutis.jpg"
},
{
"name": "Tiernan Jesrani",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/tiernan-jesrani-7b4912258/",
"github": "https://github.com/TiernanJesrani",
"image": "tiernanj.jpg"
},
{
"name": "Jordan Jones",
"title": "Project Lead",
"linkedin": "www.linkedin.com/in/jordan-jones-683704268",
"image": "jordanrj.jpeg"
},
{
"name": "Aditi Kashi",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/aditi-kashi/",
"image": "adikashi.jpg"
},
{
"name": "Jenny Lee",
"title": "Project Lead",
"linkedin": "http://linkedin.com/in/jenny-lee-42a31a227",
"github": "https://github.com/jleeone",
"image": "jleeone.jpeg"
},
{
"name": "Amelia Weyhing",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/amelia-weyhing/",
"github": "https://github.com/aweyhing",
"image": "aweyhing.JPG"
},
{
"name": "Luke Yang",
"title": "Project Lead",
"linkedin": "https://www.linkedin.com/in/um-luke-yang",
"image": "lukeyang.jpeg"
}
]
}
]
Loading

0 comments on commit 6e06fdc

Please sign in to comment.