From 87e96ae39abaa418183a264b1e11be04f84371d2 Mon Sep 17 00:00:00 2001 From: Jonah Langlieb Date: Sun, 6 Mar 2016 08:00:12 -0500 Subject: [PATCH 1/5] Fix some minor bugs --- index.html | 447 ++++++++++++++++++++++++-------------------------- results.html | 451 +++++++++++++++++++++++++++------------------------ 2 files changed, 452 insertions(+), 446 deletions(-) diff --git a/index.html b/index.html index a9e2d40..d290895 100644 --- a/index.html +++ b/index.html @@ -2,259 +2,238 @@ - - - - ReactBook - + + + + ReactBook + + + + + + + + + - - - - - - - - + - + - -
- +
-
-

ReactBook

-

How are people reacting to Facebook posts?

-

We'll show you how people feel with

-

a real-time display of reactions.

- -
+
+ Made with by Steven Zhang and Rex Ledesma - - -
+ -
- Made with by Steven Zhang and Rex Ledesma - -
+ + diff --git a/results.html b/results.html index 9a66e85..9164316 100644 --- a/results.html +++ b/results.html @@ -1,225 +1,252 @@ - - + - - - + + + - var lengthsad = sad.options.data[0].dataPoints.length; - sad.options.data[0].dataPoints.push({ y: 25 - Math.random() * 10}); - sad.render(); - var lengthangry = angry.options.data[0].dataPoints.length; - angry.options.data[0].dataPoints.push({ y: 25 - Math.random() * 10}); - angry.render(); - }); -} - - - - - - - - - - - -
-
-
-
-
- -
-
-
-
-
- + #lastthree { + display: inline-block; + margin-left: 50%; + } + #addDataPoint { + margin-left: auto; + margin-right: auto; + position: fixed; + bottom: 1px; + width: 10%; + opacity: 0; + } + #header{ + text-align:center; + } + + + + + + +
+
+
+
+
+ +
+
+
+
+
+ - From 317b5b8444f2d582c8c59574bf165a5812af1c33 Mon Sep 17 00:00:00 2001 From: stevenzhang18 Date: Sun, 6 Mar 2016 09:03:37 -0500 Subject: [PATCH 2/5] Update results.html --- results.html | 461 +++++++++++++++++++++++++-------------------------- 1 file changed, 224 insertions(+), 237 deletions(-) diff --git a/results.html b/results.html index 9164316..d79d9ee 100644 --- a/results.html +++ b/results.html @@ -1,252 +1,239 @@ + + - - - - + + - + }, + data: [ + { + // Change type to "doughnut", "line", "splineArea", etc. + type: "line", + dataPoints: [ + { y: 25 }, + + ] + } + ] + }); + wow.render(); + + var sad = new CanvasJS.Chart("chartContainersad", { + title:{ + text: "Sad Reactions" + }, + axisX:{ + labelFormatter: function(e){ + return 5* + e.value; + } + }, + data: [ + { + // Change type to "doughnut", "line", "splineArea", etc. + type: "line", + dataPoints: [ + { y: 25 }, + + ] + } + ] + }); + sad.render(); + +var angry = new CanvasJS.Chart("chartContainerangry", { + title:{ + text: "Angry Reactions" + }, + axisX:{ + labelFormatter: function(e){ + return 5* + e.value; + } + }, + data: [ + { + // Change type to "doughnut", "line", "splineArea", etc. + type: "line", + dataPoints: [ + { y: 25 }, + + ] + } + ] + }); + angry.render(); + + - - - - - - -
-
-
-
-
- -
-
-
-
-
- + }, 2000) + + + + + + + + + + + + + + +
+
+
+
+
+ +
+
+
+
+
+ From dd8a5f8d92d27fcbf42cb99c91038026d569bc31 Mon Sep 17 00:00:00 2001 From: stevenzhang18 Date: Sun, 6 Mar 2016 10:22:13 -0500 Subject: [PATCH 3/5] updated plots --- results.html | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/results.html b/results.html index d79d9ee..d243a7e 100644 --- a/results.html +++ b/results.html @@ -1,5 +1,3 @@ - - @@ -8,7 +6,18 @@ +