Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ import timelineData from './data/timeline.json';

import Timeline from './components/Timeline';


class App extends Component {
render() {
console.log(timelineData);

// Customize the code below
return (
<div className="App">
<header className="App-header">
<h1 className="App-title">Application title</h1>
<h1 className="App-title"> {timelineData["person"]}s Timeline</h1>
</header>
<main className="App-main">
<Timeline events={timelineData["events"]} />
</main>
</div>
);
Expand Down
20 changes: 16 additions & 4 deletions src/components/Timeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,21 @@ import React from 'react';
import './Timeline.css';
import TimelineEvent from './TimelineEvent';

const Timeline = () => {
// Fill in your code here
return;

const timelineEventComponents = (events) => {
return events.map((post, i) => {
return (
<TimelineEvent key={i} person={ post.person } status={ post.status } timeStamp={ post.timeStamp } />
)
})
}

const Timeline = (props) => {
return (
<div className="Timeline">
{ timelineEventComponents(props.events) }
</div>
);
}

export default Timeline;
export default Timeline;
15 changes: 11 additions & 4 deletions src/components/TimelineEvent.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,16 @@ import React from 'react';
import './TimelineEvent.css';
import Timestamp from './Timestamp';

const TimelineEvent = () => {
// Fill in your code here
return;
const TimelineEvent = (props) => {
return (
<div className="TimelineEvent">
<header className="Timeline-header">
<p>{props.person}</p>
<p>{props.status}</p>
<p><Timestamp time={props.timeStamp}/></p>
</header>
</div>
);
}

export default TimelineEvent;
export default TimelineEvent;