From 8007b2acc525f620c7a27ab58aba564eecca8e34 Mon Sep 17 00:00:00 2001
From: Jessica <jessica.homet@gmail.com>
Date: Mon, 10 Jun 2019 15:26:06 -0700
Subject: [PATCH 1/4] implemented soash meeds

---
 src/App.js                      | 11 +++++++++--
 src/components/Timeline.js      | 19 ++++++++++++++++---
 src/components/TimelineEvent.js | 11 ++++++++---
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/App.js b/src/App.js
index 5f4cdf8..9ee15a8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -3,18 +3,25 @@ import './App.css';
 import timelineData from './data/timeline.json';
 
 import Timeline from './components/Timeline';
+// import TimelineEvent from './components/TimelineEvent'; //temp
+
 
 class App extends Component {
+
   render() {
     console.log(timelineData);
+    const eventObjects = timelineData.events.map((event, i) => {
+      return event;
+    });
+    console.log(eventObjects);
 
-    // Customize the code below
     return (
       <div className="App">
         <header className="App-header">
-          <h1 className="App-title">Application title</h1>
+          <h1 className="App-title">Soash Meeds</h1>
         </header>
         <main className="App-main">
+          <Timeline events={eventObjects} />
         </main>
       </div>
     );
diff --git a/src/components/Timeline.js b/src/components/Timeline.js
index 624d4ec..3b85a7f 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -2,9 +2,22 @@ import React from 'react';
 import './Timeline.css';
 import TimelineEvent from './TimelineEvent';
 
-const Timeline = () => {
-  // Fill in your code here
-  return;
+const Timeline = (props) => {
+  const eventComponents = props.events.map((event, i) => {
+    return (
+        <TimelineEvent
+          person={event.person}
+          status={event.status}
+          timestamp={event.timestamp} />
+    );
+  });
+
+  return (
+    <section class="timeline">
+        {eventComponents}
+    </section>
+  );
 }
 
 export default Timeline;
+
diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js
index 9079165..c9be93d 100644
--- a/src/components/TimelineEvent.js
+++ b/src/components/TimelineEvent.js
@@ -2,9 +2,14 @@ import React from 'react';
 import './TimelineEvent.css';
 import Timestamp from './Timestamp';
 
-const TimelineEvent = () => {
-  // Fill in your code here
-  return;
+const TimelineEvent = (props) => {
+  return (
+    <section class="timeline-event">
+      <h4 class="event-person">{props.person}</h4>
+      <p class="event-status">{props.status}</p>
+      <p class="event-time"><Timestamp time={props.timestamp} /></p>
+    </section>
+  );
 }
 
 export default TimelineEvent;

From 109f099702090a39c6ded8fd8f845285a0a1a0d9 Mon Sep 17 00:00:00 2001
From: Jessica <jessica.homet@gmail.com>
Date: Mon, 10 Jun 2019 15:28:21 -0700
Subject: [PATCH 2/4] testing comment

---
 src/components/Timeline.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Timeline.js b/src/components/Timeline.js
index 3b85a7f..2e4cec1 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import './Timeline.css';
 import TimelineEvent from './TimelineEvent';
-
+// testing
 const Timeline = (props) => {
   const eventComponents = props.events.map((event, i) => {
     return (

From 76d28b6465c7a1acefc21b8c5b2fa70149f5fa03 Mon Sep 17 00:00:00 2001
From: Jessica <jessica.homet@gmail.com>
Date: Tue, 11 Jun 2019 09:11:50 -0700
Subject: [PATCH 3/4] add twitter blue

---
 src/App.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.css b/src/App.css
index e20270c..564d81c 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,5 +1,5 @@
 .App-header {
-  background-color: #222;
+  background-color: #38A1F3;
   padding-bottom: 0.5rem;
   color: white;
   position: fixed;

From c54b2356c35316aa4a53215d17ec60f7e7b0b548 Mon Sep 17 00:00:00 2001
From: Jessica <jessica.homet@gmail.com>
Date: Tue, 11 Jun 2019 11:19:03 -0700
Subject: [PATCH 4/4] fixed timestamp bug

---
 src/components/Timeline.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Timeline.js b/src/components/Timeline.js
index 2e4cec1..3ddea33 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -8,7 +8,7 @@ const Timeline = (props) => {
         <TimelineEvent
           person={event.person}
           status={event.status}
-          timestamp={event.timestamp} />
+          timestamp={event.timeStamp} />
     );
   });