From e667d1274adc1ef15e41ed1297200684e9ced781 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 16:23:27 -0700 Subject: [PATCH 01/10] updated TimelineEvent component --- src/components/TimelineEvent.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js index 9079165..f89af0e 100644 --- a/src/components/TimelineEvent.js +++ b/src/components/TimelineEvent.js @@ -2,9 +2,18 @@ import React from 'react'; import './TimelineEvent.css'; import Timestamp from './Timestamp'; -const TimelineEvent = () => { - // Fill in your code here - return; -} +const TimelineEvent = (props) => { + + + return ( +
+

{props.person}

+

+ +

+

{props.status}

+
+ ); +}; export default TimelineEvent; From 6c006fcb7836524e650c9d40e41372f6b663907e Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 16:23:44 -0700 Subject: [PATCH 02/10] updated Timeline component --- src/components/Timeline.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/components/Timeline.js b/src/components/Timeline.js index 624d4ec..5b40131 100644 --- a/src/components/Timeline.js +++ b/src/components/Timeline.js @@ -2,9 +2,26 @@ import React from 'react'; import './Timeline.css'; import TimelineEvent from './TimelineEvent'; -const Timeline = () => { - // Fill in your code here - return; +const Timeline = (props) => { + + const timelineEvents = props.events + + const timelineEventComponents = timelineEvents.map ((timelineEvent, i) => { + return ( +
+ +
+ ); + }); + + return ( +
+ {timelineEventComponents} +
+ ); } export default Timeline; From a1a7b4b488ca24492b6682259cd9dca8e6f8e948 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 16:24:21 -0700 Subject: [PATCH 03/10] updated App class to include Timeline component --- src/App.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 5f4cdf8..1d6311d 100644 --- a/src/App.js +++ b/src/App.js @@ -4,7 +4,10 @@ import timelineData from './data/timeline.json'; import Timeline from './components/Timeline'; + class App extends Component { + + render() { console.log(timelineData); @@ -12,9 +15,10 @@ class App extends Component { return (
-

Application title

+

Ada Lovelace's Social Media Feed

+
); From 225c1686b63a6a836099ba375023f27eea4aa09c Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 16:25:00 -0700 Subject: [PATCH 04/10] updated css to break words in order to contain them to a TimelineEvent box --- src/components/Timeline.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Timeline.css b/src/components/Timeline.css index e31f946..c18b735 100644 --- a/src/components/Timeline.css +++ b/src/components/Timeline.css @@ -1,5 +1,6 @@ .timeline { - width: 30%; + width: 40%; margin: auto; text-align: left; + word-wrap: break-word; } From 5eddb1bc2a8cf692ee8784f2ee874f03469d6376 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 17:58:16 -0700 Subject: [PATCH 05/10] updated color scheme, layout, and ada profile picture layout --- src/App.css | 25 ++++++++++++++++++++++--- src/components/Timeline.css | 3 ++- src/components/TimelineEvent.css | 15 ++++++++++++++- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/App.css b/src/App.css index e20270c..450aeba 100644 --- a/src/App.css +++ b/src/App.css @@ -1,17 +1,36 @@ .App-header { - background-color: #222; + background-color: rgb(57, 56, 56); padding-bottom: 0.5rem; color: white; - position: fixed; + height: 100px; + display: inline-block; + /* position: fixed; */ width: 100%; } .App-title { text-align: center; font-size: 1.5em; + display: inline-block; + padding-top: 20px; + padding-left: 20px; } .App-main { padding-top: 7rem; - background-color: #E6ECF0; + background-color: rgba(249, 177, 89, 0.913); +} + +img { + max-width: 150px; + border: white solid 3px; + border-radius: 50%; + margin: 20px 0px 0px 100px; + float: left; + + +} + +footer { + padding: 10px; } diff --git a/src/components/Timeline.css b/src/components/Timeline.css index c18b735..0d5fc0c 100644 --- a/src/components/Timeline.css +++ b/src/components/Timeline.css @@ -1,6 +1,7 @@ .timeline { - width: 40%; + width: 60%; margin: auto; text-align: left; word-wrap: break-word; + padding-bottom: 50px; } diff --git a/src/components/TimelineEvent.css b/src/components/TimelineEvent.css index ea6407a..da4d8c6 100644 --- a/src/components/TimelineEvent.css +++ b/src/components/TimelineEvent.css @@ -1,9 +1,11 @@ .timeline-event { display: grid; grid-template: 2rem auto 2rem / 1fr 1fr; - padding: 0.5rem; + padding: 1rem; border-bottom: 1px solid #E6ECF0; background-color: #FFF; + + } .timeline-event:hover { @@ -25,3 +27,14 @@ margin-top: 0.5rem; text-align: right; } + +.status-interactions { + grid-area: 3 / 1 / span 2 / span 2; + display: inline; + text-align: right; + +} + +.status-interactions a { + padding: 20px; +} From 1227e8c6c4b9086b72d21f728352a7ffe8a5a15a Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 17:59:09 -0700 Subject: [PATCH 06/10] added Ada profile photo --- src/App.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/App.js b/src/App.js index 1d6311d..94d67d6 100644 --- a/src/App.js +++ b/src/App.js @@ -15,11 +15,18 @@ class App extends Component { return (
+ Ada Lovelace\'s avatar

Ada Lovelace's Social Media Feed

+ +
+ kimbook, LLC +
); } From 1c2ae945adb65bbfce09bf16e51bb17dc1053651 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 17:59:59 -0700 Subject: [PATCH 07/10] fixed bug when rendering TTimeStamp --- 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 5b40131..31d1895 100644 --- a/src/components/Timeline.js +++ b/src/components/Timeline.js @@ -11,7 +11,7 @@ const Timeline = (props) => {
); From 145c1f30e5b775dcc7b8c56fcf614eb6a602c2ea Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 18:00:16 -0700 Subject: [PATCH 08/10] added comment, like, and share links --- src/components/TimelineEvent.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js index f89af0e..4f0248d 100644 --- a/src/components/TimelineEvent.js +++ b/src/components/TimelineEvent.js @@ -12,6 +12,11 @@ const TimelineEvent = (props) => {

{props.status}

+
+ Like + Comment + Share +
); }; From 74bfd7c1e61c31c5f60f6d2101e74177796e46f4 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 23:08:07 -0700 Subject: [PATCH 09/10] added avatars to all comments and changed json data --- src/App.css | 7 +++++-- src/components/Timeline.js | 3 ++- src/components/TimelineEvent.css | 26 +++++++++++++++++++++++--- src/components/TimelineEvent.js | 11 +++++++---- src/data/timeline.json | 30 ++++++++++++++++++------------ 5 files changed, 55 insertions(+), 22 deletions(-) diff --git a/src/App.css b/src/App.css index 450aeba..2ca8503 100644 --- a/src/App.css +++ b/src/App.css @@ -1,7 +1,10 @@ -.App-header { +.App-header, footer { background-color: rgb(57, 56, 56); + color:white +} + +.App-header { padding-bottom: 0.5rem; - color: white; height: 100px; display: inline-block; /* position: fixed; */ diff --git a/src/components/Timeline.js b/src/components/Timeline.js index 31d1895..8c3ba31 100644 --- a/src/components/Timeline.js +++ b/src/components/Timeline.js @@ -12,7 +12,8 @@ const Timeline = (props) => { + status={timelineEvent.status} + photo={timelineEvent.photo} /> ); }); diff --git a/src/components/TimelineEvent.css b/src/components/TimelineEvent.css index da4d8c6..45f804d 100644 --- a/src/components/TimelineEvent.css +++ b/src/components/TimelineEvent.css @@ -2,9 +2,9 @@ display: grid; grid-template: 2rem auto 2rem / 1fr 1fr; padding: 1rem; - border-bottom: 1px solid #E6ECF0; + border-bottom: 5px solid rgba(249, 177, 89, 0.913); background-color: #FFF; - + min-height: 200px; } @@ -19,6 +19,7 @@ } .event-status { + margin-top: 60px; grid-area: 2 / 1 / span 1 / -1; } @@ -29,7 +30,9 @@ } .status-interactions { - grid-area: 3 / 1 / span 2 / span 2; + padding-top: 10px; + border-top: 1px solid grey; + grid-area: 3 / 1 / span 1 / span 2; display: inline; text-align: right; @@ -38,3 +41,20 @@ .status-interactions a { padding: 20px; } + +a { + text-decoration: none; +} + +a:hover { + color: tomato; +} + +.avatar { + width: 70px; + height: 70px; + border: none; + border-radius: 50px; + margin: auto 10px auto auto; + float: left; +} diff --git a/src/components/TimelineEvent.js b/src/components/TimelineEvent.js index 4f0248d..8612462 100644 --- a/src/components/TimelineEvent.js +++ b/src/components/TimelineEvent.js @@ -7,15 +7,18 @@ const TimelineEvent = (props) => { return (
-

{props.person}

+
+ avatar +

{props.person}

+

{props.status}

); diff --git a/src/data/timeline.json b/src/data/timeline.json index b33813e..10c6da3 100644 --- a/src/data/timeline.json +++ b/src/data/timeline.json @@ -2,34 +2,40 @@ "person": "Ada Lovelace", "events": [ { - "person": "Adele Goldberg", + "person": "Rosie 'the' Riveter", "status": "In Smalltalk, everything happens somewhere else.", - "timeStamp": "2018-05-18T22:12:03Z" + "timeStamp": "2019-06-10T23:05:03Z", + "photo": "data:image/jpeg;base64,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" }, { - "person": "Erica Baker", + "person": "Grace Hopper", "status": "Every once in a while, life affords you the opportunity to have real, authentic, genuine happiness. It's up to you to see it. Pay attention.", - "timeStamp": "2018-05-18T22:19:40Z" + "timeStamp": "2019-06-10T22:12:03Z", + "photo": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/ad/Commodore_Grace_M._Hopper%2C_USN_%28covered%29.jpg/220px-Commodore_Grace_M._Hopper%2C_USN_%28covered%29.jpg" }, { - "person": "Aubrey Tang", + "person": "Katherine Johnson", "status": "The art of computer programming is a blend of mathematics and poetry.", - "timeStamp": "2018-05-18T22:41:19Z" + "timeStamp": "2019-05-30T22:41:19Z", + "photo": "https://www.virginiahumanities.org/wp-content/uploads/2015/01/Katherine-Johnson-825x550.jpg" }, { - "person": "Julia Evans", + "person": "Ellen DeGeneres", "status": "no seriously what if we replaced tech books with informative concise 30 page zines though", - "timeStamp": "2018-05-18T23:02:44Z" + "timeStamp": "2019-05-18T22:19:40Z", + "photo": "https://www.thewrap.com/wp-content/uploads/2019/05/Ellens-Greatest-Night-of-Giveaways-1.jpg" }, { - "person": "Stephanie Hurlburt", + "person": "Stay Golden", "status": "I don’t think you can do good work if you’re not at least occasionally talking to a person you’re building for.", - "timeStamp": "2018-05-18T23:09:38Z" + "timeStamp": "2019-01-09T22:41:19Z", + "photo": "https://pmcdeadline2.files.wordpress.com/2018/10/bd2xz1v9eejud0ryymv8.jpg?w=681&h=383&crop=1" }, { - "person": "Yan Zhu", + "person": "Amelia", "status": "//for a good time, paste this into twitter page console: c=new AudioContext;n=setInterval(\"for(n+=7,i=k,P='\u25b2.\\\n';i-=1/k;P+=P[i%2?(i%2*j-j+n/k^j)&1:2])j=k/i;doc.innerHTML=P;with(c.createOscillator())frequency.value=200*(j+n/k^j),connect(c.destination),start(),stop(n/k)\",k=64)", - "timeStamp": "2018-05-18T23:51:01Z" + "timeStamp": "2018-09-18T23:51:01Z", + "photo": "https://upload.wikimedia.org/wikipedia/commons/b/b2/Amelia_Earhart_standing_under_nose_of_her_Lockheed_Model_10-E_Electra%2C_small.jpg" } ] } From 168a142bb69e95de15a27c217b9eb27206353960 Mon Sep 17 00:00:00 2001 From: Kimberly-Fasbender Date: Mon, 10 Jun 2019 23:13:23 -0700 Subject: [PATCH 10/10] changed footer color --- src/App.js | 3 --- src/components/Timeline.css | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/App.js b/src/App.js index 94d67d6..7e8ba9a 100644 --- a/src/App.js +++ b/src/App.js @@ -9,9 +9,6 @@ class App extends Component { render() { - console.log(timelineData); - - // Customize the code below return (
diff --git a/src/components/Timeline.css b/src/components/Timeline.css index 0d5fc0c..f1cb973 100644 --- a/src/components/Timeline.css +++ b/src/components/Timeline.css @@ -1,5 +1,5 @@ .timeline { - width: 60%; + width: 800px; margin: auto; text-align: left; word-wrap: break-word;