Skip to content

Commit 4373d64

Browse files
committed
kyler/siteHomeNavBar
1 parent 84b9774 commit 4373d64

File tree

8 files changed

+62
-23
lines changed

8 files changed

+62
-23
lines changed
799 KB
Loading

mlflow-site/src/app/components/NavBar.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use client';
22

33
import Image from 'next/image';
4-
import githubLogo from '../assets/GithubLogo.png';
54

65
const NavBar = () => {
76
return (
@@ -46,7 +45,7 @@ const NavBar = () => {
4645
href='https://github.com/oslabs-beta/mlflow-js'
4746
className='navBarLinksGithub'
4847
>
49-
<Image src={githubLogo} width={24} height={24} alt='G' />
48+
<Image src={'/assets/GithubLogo.png'} width={24} height={24} alt='G' />
5049
</a>
5150
</div>
5251
</div>

mlflow-site/src/app/components/Team.tsx

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,55 @@ const Team = () => {
66
name: 'Yiqun Zheng',
77
github: 'https://github.com/yiqunzheng',
88
linkedIn: 'https://www.linkedin.com/in/yiqunzheng/',
9+
pfp: '',
910
},
1011
{
1112
name: 'Kyler Chiago',
1213
github: 'https://github.com/Kyler-Chiago',
1314
linkedIn: 'https://www.linkedin.com/in/kyler-chiago/',
15+
pfp: '/assets/kylerpfp.png',
1416
},
1517
{
1618
name: 'Austin Fraser',
1719
github: 'https://github.com/austinbfraser',
1820
linkedIn: 'http://www.linkedin.com/in/austin-fraser',
21+
pfp: '',
1922
},
2023
{
2124
name: 'Stephany Ho',
2225
github: 'https://github.com/seneyu/',
2326
linkedIn: 'https://www.linkedin.com/in/stephanyho/',
27+
pfp: '',
2428
},
25-
{
26-
name: 'Winston Ludlam',
27-
github: 'https://github.com/winjolu/',
28-
linkedIn: 'https://www.linkedin.com/in/wjludlam/',
29-
},
29+
// {
30+
// name: 'Winston Ludlam',
31+
// github: 'https://github.com/winjolu/',
32+
// linkedIn: 'https://www.linkedin.com/in/wjludlam/',
33+
// pfp: '',
34+
// },
3035
];
3136

3237
return (
3338
<div className='team' id='team'>
34-
<div className='centered'>Meet the team</div>
39+
<div className='centered teamHead'>Meet the team</div>
3540
<div className='teamCards'>
3641
{teamArray.map((member, index) => (
3742
<TeamCard
3843
key={index}
3944
name={member.name}
4045
github={member.github}
4146
linkedIn={member.linkedIn}
47+
pfp={member.pfp}
4248
/>
4349
))}
4450
</div>
51+
<TeamCard
52+
key={'soloCard'}
53+
name={'Winston Ludlam'}
54+
github={'https://github.com/winjolu/'}
55+
linkedIn={'https://www.linkedin.com/in/wjludlam/'}
56+
pfp={''}
57+
/>
4558
</div>
4659
);
4760
};

mlflow-site/src/app/components/TeamCard.tsx

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,34 @@
1-
// import imageNotFound from '/../..//assets/imageNotFound.jpg'
1+
import Image from 'next/image';
22

33
interface TeamCardProps {
44
name: string;
55
github: string;
66
linkedIn: string;
7+
pfp: string;
78
}
89

9-
const TeamCard: React.FC<TeamCardProps> = ({
10-
name,
11-
github,
12-
linkedIn,
13-
}) => {
10+
const TeamCard: React.FC<TeamCardProps> = ({ name, github, linkedIn, pfp }) => {
1411
return (
1512
<div className='teamcard'>
16-
{/* <div style={{ backgroundImage: 'url(../../assets/imageNotFound.jpg)' }} className='teamCardImg'></div> */}
17-
{/* <img src={imageNotFound} alt='Miss'></img> */}
18-
{/* <img src={require('../../assets/imageNotFound.jpg')} alt="Test"></img> */}
13+
<Image src={pfp} width={70} height={70} alt='No Image' />
1914
<div>{name}</div>
20-
<div>
21-
<a href={github}>G </a>
22-
<a href={linkedIn}>L </a>
15+
<div className='teamcardLinks'>
16+
<a href={github} className='teamCardLink1'>
17+
<Image
18+
src={'/assets/GithubLogo.png'}
19+
width={20}
20+
height={20}
21+
alt='G'
22+
/>
23+
</a>
24+
<a href={linkedIn} className='teamCardLink2'>
25+
<Image
26+
src={'/assets/LinkedInLogo.png'}
27+
width={20}
28+
height={20}
29+
alt='L'
30+
/>
31+
</a>
2332
</div>
2433
</div>
2534
);

mlflow-site/src/app/globals.css

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ body {
142142
grid-row: 4;
143143
width: 100%;
144144
height: fit-content;
145-
background-color: yellow;
145+
/* background-color: yellow; */
146146
display: flex;
147147
justify-content: center;
148148
align-items: center;
@@ -214,16 +214,20 @@ body {
214214
grid-template-rows: min-content;
215215
}
216216

217+
.teamHead {
218+
font-size: 1.35rem;
219+
}
220+
217221
.teamCards {
218222
width: 100%;
219223
display: grid;
220224
grid-template-columns: 50% 50%;
221225
grid-template-rows: repeat(calc(100%/3), 3);
222-
/* border: #0a0a0a; */
223-
background-color: red;
226+
/* background-color: red; */
224227
}
225228

226229
.teamcard {
230+
margin-top: 0.5rem;
227231
display: flex;
228232
flex-direction: column;
229233
justify-content: center;
@@ -233,4 +237,18 @@ body {
233237
.teamCardImg {
234238
width: 50px;
235239
height: 50px;
240+
}
241+
242+
.teamcardLinks {
243+
display: grid;
244+
grid-template-columns: 45% 10% 45%;
245+
grid-template-rows: 100%;
246+
}
247+
248+
.teamCardLink1 {
249+
grid-column: 1;
250+
}
251+
252+
.teamCardLink2 {
253+
grid-column: 3;
236254
}

0 commit comments

Comments
 (0)