Skip to content

Commit 72f1eef

Browse files
committed
Merge branch 'dev' into stephany/cicd
2 parents 4104819 + 3daf149 commit 72f1eef

11 files changed

+118
-31
lines changed
7.69 KB
Loading
14.2 KB
Loading
+25-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
1+
'use client';
2+
13
const Button = () => {
2-
return (
3-
<div className='button'>Button</div>
4-
)
5-
}
6-
7-
export default Button
4+
return (
5+
<div className='button'>
6+
<button
7+
onClick={() => {
8+
window.location.assign('https://github.com/oslabs-beta/mlflow-js');
9+
}}
10+
className='homeButton homeButtonDownload text-white'
11+
>
12+
Download
13+
</button>
14+
<button
15+
onClick={() => {
16+
window.location.assign('https://github.com/oslabs-beta/mlflow-js/tree/dev/mlflow/docs');
17+
}}
18+
className='homeButton homeButtonRead'
19+
>
20+
Read the Docs
21+
</button>
22+
</div>
23+
);
24+
};
25+
26+
export default Button;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const Demo = () => {
22
return (
3-
<div className='demo'>
3+
<div className='demo' id='demo'>
44
<div className='demoSplit'>
55
<div>Img 1</div>
66
<div>Demo 1</div>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import FeatureCard from "./FeatureCard";
22

33
const Features = () => {
44
return (
5-
<div className='features'>
5+
<div className='features' id='features'>
66
<div>MLOps in Javascript, made simple.</div>
77
<div>Long blurb</div>
88
<FeatureCard/>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import Button from './Button';
22

33
const Headline = () => {
44
return (
5-
<div className='home'>
6-
<div>MLOps workflow for Javascript</div>
5+
<div className='home' id='headline'>
6+
<div className='bigHeadline'>MLOps workflow for Javascript</div>
77
<div>Harness MLflow&apos;s MLOps functionality for your Javascript application with MLflow.js</div>
88
<Button />
99
</div>

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

+46-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,53 @@
1+
'use client';
2+
3+
import Image from 'next/image';
4+
import githubLogo from '../assets/GithubLogo.png';
5+
16
const NavBar = () => {
27
return (
38
<div className='navBar'>
4-
<div>MLflow.js</div>
9+
<div className='navBarMlflow'>MLflow.js</div>
510
<div className='navBarLinks'>
6-
<div>Home</div>
7-
<div className='navBarLinksFeatures'>Features</div>
8-
<div className='navBarLinksDemo'>Demo</div>
9-
<div className='navBarLinksTeam'>Team</div>
10-
<div className='navBarLinksGithub'>G</div>
11-
<div className='navBarLinksLinkedIn'>L</div>
11+
<button
12+
onClick={() => {
13+
const element = document.getElementById('headline');
14+
element?.scrollIntoView({ behavior: 'smooth' });
15+
}}
16+
>
17+
Home
18+
</button>
19+
<button
20+
onClick={() => {
21+
const element = document.getElementById('features');
22+
element?.scrollIntoView({ behavior: 'smooth' });
23+
}}
24+
>
25+
Features
26+
</button>
27+
<button
28+
onClick={() => {
29+
const element = document.getElementById('demo');
30+
element?.scrollIntoView({ behavior: 'smooth' });
31+
}}
32+
className='navBarLinksDemo'
33+
>
34+
Demo
35+
</button>
36+
<button
37+
onClick={() => {
38+
const element = document.getElementById('team');
39+
element?.scrollIntoView({ behavior: 'smooth' });
40+
}}
41+
className='navBarLinksTeam'
42+
>
43+
Team
44+
</button>
45+
<a
46+
href='https://github.com/oslabs-beta/mlflow-js'
47+
className='navBarLinksGithub'
48+
>
49+
<Image src={githubLogo} width={24} height={24} alt='G' />
50+
</a>
1251
</div>
1352
</div>
1453
);

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const Team = () => {
3030
];
3131

3232
return (
33-
<div className='team'>
33+
<div className='team' id='team'>
3434
<div className='centered'>Meet the team</div>
3535
<div className='teamCards'>
3636
{teamArray.map((member, index) => (

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import imageNotFound from '../../assets/imageNotFound.jpg'
1+
// import imageNotFound from '/../..//assets/imageNotFound.jpg'
22

33
interface TeamCardProps {
44
name: string;
@@ -14,7 +14,7 @@ const TeamCard: React.FC<TeamCardProps> = ({
1414
return (
1515
<div className='teamcard'>
1616
{/* <div style={{ backgroundImage: 'url(../../assets/imageNotFound.jpg)' }} className='teamCardImg'></div> */}
17-
<img src={imageNotFound} alt='Miss'></img>
17+
{/* <img src={imageNotFound} alt='Miss'></img> */}
1818
{/* <img src={require('../../assets/imageNotFound.jpg')} alt="Test"></img> */}
1919
<div>{name}</div>
2020
<div>

mlflow-site/src/app/globals.css

+40-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@tailwind components;
33
@tailwind utilities;
44

5-
:root {
5+
/* :root {
66
--background: #ffffff;
77
--foreground: #171717;
88
}
@@ -12,13 +12,14 @@
1212
--background: #0a0a0a;
1313
--foreground: #ededed;
1414
}
15-
}
15+
} */
1616

1717
body {
1818
color: var(--foreground);
1919
background: var(--background);
20-
font-family: Arial, Helvetica, sans-serif;
20+
font-family: Inter;
2121
font-size: 1rem;
22+
color: rgb(0, 0, 0);
2223
}
2324

2425
@layer utilities {
@@ -74,15 +75,15 @@ body {
7475
grid-row: 1;
7576
display: grid;
7677
grid-template-columns: 0.7rem 1.3rem 1fr 1.3rem 0.7rem;
77-
grid-template-rows: 1.3rem 2.8rem 1fr min-content 1.3rem;
78+
grid-template-rows: 1.3rem min-content 1fr min-content 1.3rem;
7879
}
7980

8081
.navBar {
8182
grid-column: 2/5;
8283
grid-row: 2;
8384
width: 100%;
8485
height: 100%;
85-
background-color: #0a0a0a;
86+
/* background-color: #7e7e7e; */
8687
display: grid;
8788
grid-template-columns: auto auto;
8889
grid-template-rows: 100%;
@@ -94,8 +95,9 @@ body {
9495
width: 100%;
9596
height: 100%;
9697
display: grid;
97-
grid-template-columns: repeat(calc(100%/6), 6);
98+
grid-template-columns: repeat(calc(100%/5), 5);
9899
grid-template-rows: 100%;
100+
align-items: center;
99101
}
100102

101103
.navBarLinksFeatures {
@@ -114,16 +116,25 @@ body {
114116
grid-column: 5;
115117
}
116118

117-
.navBarLinksLinkedIn {
118-
grid-column: 6;
119+
.navBarMlflow {
120+
color: rgb(66, 107, 31);
121+
font-size: 1.2rem;
122+
font-family: Newsreader;
123+
display: flex;
124+
align-items: center;
125+
}
126+
127+
.bigHeadline {
128+
font-size: 1.7rem;
129+
font-family: Newsreader;
119130
}
120131

121132
.mobileInnerWrapper {
122133
grid-column: 3;
123134
grid-row: 3;
124135
width: 100%;
125136
height: 100%;
126-
background-color: aqua;
137+
/* background-color: aqua; */
127138
}
128139

129140
.team {
@@ -139,15 +150,33 @@ body {
139150
}
140151

141152
.home {
153+
margin-top: 0.3rem;
142154
grid-column: 2/5;
143155
grid-row: 3;
144156
width: 100%;
145-
background-color: rgb(102, 102, 54);
157+
/* background-color: rgb(102, 102, 54); */
158+
}
159+
160+
.homeButton {
161+
padding: 3px;
162+
padding-left: 6px;
163+
padding-right: 6px;
164+
border-radius: 5px;
165+
font-size: 0.8rem;
166+
margin-right: 8px;
167+
}
168+
169+
.homeButtonDownload {
170+
background-color: rgb(66, 107, 31);
171+
}
172+
173+
.homeButtonRead {
174+
background-color: rgb(204, 204, 204);
146175
}
147176

148177
.button {
149178
width: 100%;
150-
background-color: rgb(14, 69, 129);
179+
/* background-color: rgb(14, 69, 129); */
151180
}
152181

153182
.features {

0 commit comments

Comments
 (0)