-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'angela/homepage-setup' of https://github.com/acmucsd/ha…
…ck-website into angela/homepage-setup
- Loading branch information
Showing
12 changed files
with
91 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,57 @@ | ||
import React from 'react'; | ||
import styles from './style.module.css'; | ||
|
||
const TeamCard: React.FC = () => { | ||
return <h3>TeamCard</h3>; | ||
const teamMembers = [ | ||
{ | ||
name: 'Nikhil Dange', | ||
position: 'Hack Technical Lead', | ||
email: '[email protected]', | ||
imageUrl: 'assets/nikhil2_pfp.JPG', | ||
}, | ||
{ | ||
name: 'Angela Hu', | ||
position: 'Hack Technical Event Directors', | ||
email: '[email protected]', | ||
imageUrl: 'assets/angela_pfp.PNG', | ||
}, | ||
{ | ||
name: 'Khushi Patel', | ||
position: 'Hack Technical Event Directors', | ||
email: '[email protected]', | ||
imageUrl: 'assets/khushi_pfp.PNG', | ||
}, | ||
{ | ||
name: 'Charvi Shukla', | ||
position: 'Hack Technical Event Directors', | ||
email: '[email protected]', | ||
imageUrl: 'assets/charvi_pfp.PNG', | ||
}, | ||
{ | ||
name: 'Alexis Vergnet', | ||
position: 'Hack Technical Event Directors', | ||
email: '[email protected]', | ||
imageUrl: 'assets/alexis_pfp.PNG', | ||
}, | ||
]; | ||
|
||
|
||
return ( | ||
<div className={styles.team}> | ||
{teamMembers.map((member, index) => ( | ||
<div key={index} className={styles.card}> | ||
<div className={styles.cardOutline}> | ||
<img src={member.imageUrl} | ||
alt={member.name} | ||
/> | ||
<h4>{member.name}</h4> | ||
<p>{member.position}</p> | ||
<p>{member.email}</p> | ||
</div> | ||
</div> | ||
))} | ||
</div> | ||
); | ||
}; | ||
|
||
export default TeamCard; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
.team { | ||
display: flex; | ||
flex-wrap: wrap; | ||
justify-content: center; | ||
} | ||
|
||
.card { | ||
margin: 10px; | ||
text-align: center; | ||
} | ||
|
||
.cardOutline { | ||
border: 2px solid #333; | ||
padding: 16px; | ||
text-align: center; | ||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); | ||
border-radius: 10px; | ||
} | ||
|
||
.card img { | ||
width: 250px; | ||
height: 250px; | ||
border-radius: 50%; | ||
display: inline-block; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,13 @@ | ||
import styles from './style.module.css'; | ||
import TeamCard from '../../components/team-card/index'; | ||
|
||
const Team: React.FC = () => { | ||
return <h3 className={styles.team}>Team Section</h3>; | ||
return ( | ||
<div> | ||
<h3 className={styles.team}>Team Section</h3> | ||
<TeamCard /> | ||
</div> | ||
) | ||
}; | ||
|
||
export default Team; | ||
export default Team; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,4 +6,5 @@ | |
height: 30vh; | ||
max-height: 100vh; | ||
border-bottom: 1px solid black; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters