Skip to content

Commit aa9a56b

Browse files
committed
save
1 parent ebcf88b commit aa9a56b

File tree

5 files changed

+93
-7
lines changed

5 files changed

+93
-7
lines changed

src/About.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import React, { Fragment } from "react";
2+
3+
const About = () => {
4+
return (
5+
<Fragment>
6+
<h2>About Us</h2>
7+
<p>Some description</p>
8+
<h3>Exec</h3>
9+
<h3>Contact Us</h3>
10+
</Fragment>
11+
);
12+
};
13+
14+
export default About;

src/Footer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import React from "react";
22

33
const Footer = () => (
44
<footer className="footer">
5-
<div className="container">
6-
Copyright {"\u00A9 " + new Date().getFullYear()} ACM SIGGRAPH UIUC
7-
</div>
5+
Copyright {"\u00A9 " + new Date().getFullYear()} ACM SIGGRAPH UIUC
86
</footer>
97
);
108

src/Header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const Header = () => (
2222
id="navbarNav"
2323
>
2424
<div className="navbar-nav">
25-
<NavLink to="/" className="nav-item nav-link">
25+
<NavLink exact to="/" className="nav-item nav-link">
2626
Home
2727
</NavLink>
2828
<NavLink to="/projects" className="nav-item nav-link">

src/Navigation.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
import React from "react";
22
import { BrowserRouter as Router, Route } from "react-router-dom";
33

4-
import App from "./App";
54
import Header from "./Header";
65
import Footer from "./Footer";
76

7+
import App from "./App";
8+
import Projects from "./Projects";
9+
import About from "./About";
10+
811
const Navigation = () => (
912
<Router basename={process.env.PUBLIC_URL}>
1013
<div className="container">
1114
<DefaultLayout exact path="/" component={App} />
12-
<DefaultLayout path="/projects" component={Construction} />
13-
<DefaultLayout path="/about" component={Construction} />
15+
<DefaultLayout path="/projects" component={Projects} />
16+
<DefaultLayout path="/about" component={About} />
1417
</div>
1518
</Router>
1619
);

src/Projects.js

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
import React, { Fragment } from "react";
2+
3+
const projects = {
4+
current: [
5+
{
6+
name: "Go Squirrel",
7+
description:
8+
"A tiny little squirrel is crossing the street, and there comes a car..."
9+
},
10+
{
11+
name: "Lorem ipsum",
12+
description:
13+
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
14+
},
15+
{
16+
name: "Lorem ipsum",
17+
description:
18+
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
19+
}
20+
],
21+
past: [
22+
{
23+
name: "Lorem ipsum",
24+
description:
25+
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
26+
},
27+
{
28+
name: "Lorem ipsum",
29+
description:
30+
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
31+
},
32+
{
33+
name: "Lorem ipsum",
34+
description:
35+
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
36+
}
37+
]
38+
};
39+
40+
const Project = ({ item }) => {
41+
return (
42+
<div className="card col m-3">
43+
<div className="card-body">
44+
<h3 className="card-title">{item.name}</h3>
45+
<p className="card-text">{item.description}</p>
46+
</div>
47+
</div>
48+
);
49+
};
50+
51+
const Projects = () => {
52+
console.log(projects);
53+
return (
54+
<Fragment>
55+
<h2>Current</h2>
56+
<div className="row mr-3 ml-3">
57+
{projects.current.map(item => (
58+
<Project item={item} key={item.name} />
59+
))}
60+
</div>
61+
<h2>Past</h2>
62+
<div className="row mr-3 ml-3">
63+
{projects.current.map(item => (
64+
<Project item={item} key={item.name} />
65+
))}
66+
</div>
67+
</Fragment>
68+
);
69+
};
70+
71+
export default Projects;

0 commit comments

Comments
 (0)