From ce97dafcd724d98f015854c98527b69c252e5505 Mon Sep 17 00:00:00 2001
From: Lola Llanes <mslourdesllanes@gmail.com>
Date: Tue, 14 Apr 2020 22:39:44 -0700
Subject: [PATCH 1/5] added const timelineComponents to return user name and
 message

---
 src/components/TimelineEvent.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js
index cc476c2..81f4369 100644
--- a/src/components/TimelineEvent.js
+++ b/src/components/TimelineEvent.js
@@ -1,10 +1,23 @@
 import React from 'react';
 import './TimelineEvent.css';
-import Timestamp from './Timestamp';
+// import Timestamp from './Timestamp';
 
-const TimelineEvent = () => {
-  
-  return;
-}
+const TimelineEvent = (props) => {
+  const timelineComponents = props.events.map((event,) => {
+    return (
+      <TimelineEvent
+        person={event.person}
+        status={event.status}
+        timeStamp={event.timeStamp}
+        
+      />
+    );
+  });
+  return(
+    <main className="Timeline timeline">
+    {timelineComponents}
+    </main>
+  );
+};
 
 export default TimelineEvent;
\ No newline at end of file

From 25bbd6b069b15cb34d1130ba0641e51c100a8fdb Mon Sep 17 00:00:00 2001
From: Lola Llanes <mslourdesllanes@gmail.com>
Date: Tue, 14 Apr 2020 23:21:49 -0700
Subject: [PATCH 2/5] added timeline and timelinedata const

---
 src/components/Timeline.js | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/components/Timeline.js b/src/components/Timeline.js
index 463eb3e..2482cc9 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -2,9 +2,24 @@ import React from 'react';
 import './Timeline.css';
 import TimelineEvent from './TimelineEvent';
 
-const Timeline = () => {
-  
-  return;
-}
+const Timeline = (props) => {
+  const TimelineData = props.events.map((event, i) => {
+    return (
+      <Timeline
+        key={i}
+        person={event.person}
+        status={event.status}
+        timeStamp={event.timeStamp}
+      />
+    );
+  });
+  return (
+    <main className="timeline">
+      {TimelineData}
+    </main>
+  );
+};
+
+export default TimelineEvent;
+
 
-export default Timeline;
\ No newline at end of file

From d492cd5e7fd4ccf0b2c88a2d4585593a6ccc4c69 Mon Sep 17 00:00:00 2001
From: Lola Llanes <mslourdesllanes@gmail.com>
Date: Wed, 15 Apr 2020 07:34:11 -0700
Subject: [PATCH 3/5] fixed bugs to show user timeline i.e. rewrote const
 timeline/const events

---
 src/components/Timeline.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/Timeline.js b/src/components/Timeline.js
index 2482cc9..94b2abe 100644
--- a/src/components/Timeline.js
+++ b/src/components/Timeline.js
@@ -2,24 +2,23 @@ import React from 'react';
 import './Timeline.css';
 import TimelineEvent from './TimelineEvent';
 
+
+
 const Timeline = (props) => {
-  const TimelineData = props.events.map((event, i) => {
+  const events = props.events.map((event, i) => {
     return (
-      <Timeline
-        key={i}
-        person={event.person}
-        status={event.status}
-        timeStamp={event.timeStamp}
-      />
+      <div key={i}>
+        <TimelineEvent person={event.person} status={event.status} time={event.timeStamp}/>
+      </div>
     );
   });
+
   return (
-    <main className="timeline">
-      {TimelineData}
-    </main>
+    <div className="timeline">{events}</div>
   );
 };
 
-export default TimelineEvent;
+//cd desktop/ada/projects/react-timeline/src
+export default Timeline;
 
 

From 9fb3b91228e0321330ad0dfb520c8b589f748de0 Mon Sep 17 00:00:00 2001
From: Lola Llanes <mslourdesllanes@gmail.com>
Date: Wed, 15 Apr 2020 07:36:59 -0700
Subject: [PATCH 4/5] added notes and tried to paly around with the import
 section =/

---
 src/components/TimelineEvent.js | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js
index 81f4369..6d5f3c7 100644
--- a/src/components/TimelineEvent.js
+++ b/src/components/TimelineEvent.js
@@ -1,23 +1,16 @@
 import React from 'react';
 import './TimelineEvent.css';
-// import Timestamp from './Timestamp';
+import Timestamp from './Timestamp';
 
 const TimelineEvent = (props) => {
-  const timelineComponents = props.events.map((event,) => {
-    return (
-      <TimelineEvent
-        person={event.person}
-        status={event.status}
-        timeStamp={event.timeStamp}
-        
-      />
-    );
-  });
-  return(
-    <main className="Timeline timeline">
-    {timelineComponents}
-    </main>
+  return (
+  <div className="timeline-event">
+    <h2 className="event-person">{props.person}</h2>
+    <p className="event-status">{props.status}</p>
+      {/*Kaida helped fix the time={props.time} duirng roundtable*/}
+    <p className="event-time"> <Timestamp time={props.Timestamp}/></p>
+  </div>
   );
 };
 
-export default TimelineEvent;
\ No newline at end of file
+export default TimelineEvent; 
\ No newline at end of file

From a1e24e12f82eb67273b0167b9fec3d7cfc542245 Mon Sep 17 00:00:00 2001
From: Lola Llanes <mslourdesllanes@gmail.com>
Date: Wed, 15 Apr 2020 07:37:55 -0700
Subject: [PATCH 5/5] tried to reconfigure bc timeline was not showing

---
 src/App.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/App.js b/src/App.js
index 76d86d2..0e2f880 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,19 +1,19 @@
 import React from 'react';
-import logo from './logo.svg';
 import './App.css';
 import timelineData from './data/timeline.json';
 import Timeline from './components/Timeline';
 
-function App() {
-  console.log(timelineData);
 
+function App() {
+  console.log(timelineData.events);
   // 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 social media feed</h1>
       </header>
       <main className="App-main">
+        <Timeline events={timelineData.events}/>
       </main>
     </div>
   );