From 1c1bb9b91f5b8ca075ac81f23b7296a6cb687860 Mon Sep 17 00:00:00 2001
From: Vibha Sinha <vibha.sinha@us.ibm.com>
Date: Tue, 4 Oct 2016 12:57:14 -0700
Subject: [PATCH 1/4] Minor edits to personal email sample

---
 public/data/personal-email.txt | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/public/data/personal-email.txt b/public/data/personal-email.txt
index bc468285..041c2b06 100644
--- a/public/data/personal-email.txt
+++ b/public/data/personal-email.txt
@@ -1,12 +1,8 @@
 Hi Team,
 
-The times are difficult! Our sales have been disappointing for the past three quarters for our data analytics product suite. We have a competitive data analytics product suite in the industry. But we are not doing a good job at selling it.
+The times are difficult! Our sales have been disappointing for the past three quarters for our data analytics product suite. We have a competitive data analytics product suite in the industry. But we are not doing a good job at selling it and this is really frustrating.
 
-We need to acknowledge and fix our sales challenges. We cannot blame the economy for our lack of execution! We are missing critical sales opportunities. Our clients are hungry for analytical tools to improve their business outcomes. In fact, it is in times such as this, our clients want to get the insights they need to turn their businesses around. We need to buckle up and execute.
-
-In summary, we have a competitive product, and a hungry market. We have to do our job to close the deals.
+We need to acknowledge and fix our sales challenges. We cannot blame the economy for our lack of execution! We are missing critical sales opportunities. Our clients are hungry for analytical tools to improve their business outcomes. In fact, it is in times such as this, our clients want to get the insights they need to turn their businesses around. We need to buckle up and execute. In summary, we have a competitive product, and a hungry market. We are really failing at closing deals and we need to now focus on that.
 
 Jennifer Baker
-
 Sales Leader, North-East region
-

From 5cd68e49da4417b94ad8253b694b40279503b4bc Mon Sep 17 00:00:00 2001
From: German Attanasio Ruiz <germanattanasio@gmail.com>
Date: Thu, 13 Oct 2016 11:51:19 -0400
Subject: [PATCH 2/4] disable helmet frameguard

---
 config/security.js | 5 ++++-
 package.json       | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/security.js b/config/security.js
index 09634d3f..761c6332 100644
--- a/config/security.js
+++ b/config/security.js
@@ -26,7 +26,10 @@ module.exports = function(app) {
   app.enable('trust proxy');
 
   // 1. helmet with defaults
-  app.use(helmet({ cacheControl: false }));
+  app.use(helmet({
+    cacheControl: false,
+    frameguard: false
+  }));
 
   // 2. rate limiting
   app.use('/api/', rateLimit({
diff --git a/package.json b/package.json
index 64794108..2e88af6b 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "express": "^4.12.2",
     "express-rate-limit": "^2.1.0",
     "express-secure-only": "^0.2.1",
-    "helmet": "^2.1.1",
+    "helmet": "^2.3.0",
     "watson-developer-cloud": "^1.12.4"
   },
   "devDependencies": {

From 8e8a7375da95d05aa09f6e5e58b6a5a654df11cd Mon Sep 17 00:00:00 2001
From: Alex Meyer <alexmeyer@us.ibm.com>
Date: Fri, 14 Oct 2016 10:35:49 -0500
Subject: [PATCH 3/4] add feedback

---
 .gitignore      |  1 +
 views/index.ejs | 95 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

diff --git a/.gitignore b/.gitignore
index f3bbd849..058e4bb5 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ node_modules
 .DS_Store
 .env
 coverage
+app.js
diff --git a/views/index.ejs b/views/index.ejs
index 1bdcaf06..f9acefa9 100755
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -337,6 +337,39 @@
           display: block;
       }
 
+      .results-table--feedback-inputs {
+        margin-top: .5em;
+        margin-bottom: .5em;
+        padding-top: .5em;
+        padding-bottom: .5em;
+      }
+
+      .document-level-thankyou, .sentence-level-thankyou {
+        display: none;
+        background: green;
+        color: white;
+        margin-top: .5em;
+        margin-bottom: .5em;
+        padding-top: .5em;
+        padding-bottom: .5em;
+      }
+
+      .thankyou {
+        transition: opacity 1s ease-out;
+        opacity: 0;
+        height: 0;
+        overflow: hidden;
+      }
+
+      .thankyou.active {
+        opacity: 1;
+        height: auto;
+      }
+
+      .vote {
+        margin-left: .5em;
+      }
+
       @media (max-width: 700px) {
           .left-box {
               width: 100%;
@@ -502,6 +535,26 @@
             <p class="base--p">The Language Style and Social Tendencies graphs represent the amount of a language or social tone present in the text. <a class="base--a" target="_blank" href="http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/tone-analyzer/understanding-tone.shtml#social">Learn more</a>.</p>
           </div>
         </div>
+        <div class="summary--row">
+
+                      <div class="results-table--feedback-inputs dcl">
+                        <label><em class="base--em">Do you agree with this result?</em></label>
+                        <input type="radio"  checked="false" role="radio" id="class-yes" name="document-level" value="no" class="base--radio results-table--input-yes">
+                        <label for="class-yes" class="base--inline-label vote results-table--input-yes-label">Yes</label>
+                        <input type="radio"  checked="false" role="radio" id="class-no" name="document-level" value="no" class="base--radio results-table--input-no">
+                        <label for="class-no" class="base--inline-label vote results-table--input-no-label">No</label>
+                      </div>
+                 <!------>
+                    <div class="document-level-thankyou" style="text-align:center">
+                      <span class="results-table--feedback-thanks">
+                        <em class="base--em">Thank You</em>
+                      </span>
+                    </div>
+                 <!------>
+
+                </div>
+
+
         <div class="summary-row">
           <span class="icon-hyperlink summary-view-code-button">
   					<img class="icon icon-code" src="images/icons/code.svg" />
@@ -585,6 +638,23 @@
             <!-- .tab-panels -->
           </div>
           <!-- .sentences--sentence-views -->
+
+        </div>
+        <div class="summary--row">
+                     <div class="results-table--feedback-inputs scl">
+                       <label><em class="base--em">Do you agree with this result? </em></label>
+                       <input type="radio" role="radio" checked="false" id="class-yes-sentance" name="sentence-level" value="yes" class="base--radio results-table--input-yes">
+                       <label for="class-yes-sentance" class="base--inline-label vote results-table--input-yes-label">Yes</label>
+                       <input type="radio" role="radio" checked="false" id="class-no-sentance" name="sentence-level" value="no" class="base--radio results-table--input-no">
+                       <label for="class-no-sentance" class="base--inline-label vote results-table--input-no-label">No</label>
+                     </div>
+               <!------>
+                   <div class="sentence-level-thankyou" style="text-align:center">
+                     <span class="results-table--feedback-thanks">
+                       <em class="base--em">Thank You</em>
+                     </span>
+                   </div>
+                <!------>
         </div>
         <!-- .sentences -->
         <div class="output--reset icon-hyperlink">
@@ -758,6 +828,31 @@
     ga('create', '<$= ga $>', 'auto');
     ga('send', 'pageview');
   </script>
+  <script type="text/javascript">
+  $(document).ready(function(){
+    $('input[name="document-level"]').prop('checked', false);
+    $('input[name="sentence-level"]').prop('checked', false);
+
+    $(".input--submit-button, .output--reset-button").click(function() {
+      $('input[name="document-level"]').prop('checked', false);
+      $('input[name="sentence-level"]').prop('checked', false);
+      });
+  		$("input[name='document-level']").click(function() {
+        setTimeout(function(){
+          $('.dcl').hide(0).delay(2000).show(0);
+  				$('.document-level-thankyou').show(0).delay(2000).hide(0);
+        }, 100);
+  		});
+      		$("input[name='sentence-level']").click(function() {
+          setTimeout(function(){
+          $('.scl').hide(0).delay(2000).show(0);
+  				$('.sentence-level-thankyou').show(0).delay(2000).hide(0);
+        }, 100);
+  		});
+  });
+  </script>
+
+
 </body>
 
 </html>

From 59075f7d1df41365385f5c5451278a12bed46feb Mon Sep 17 00:00:00 2001
From: Alex Meyer <alexmeyer@us.ibm.com>
Date: Fri, 14 Oct 2016 10:38:25 -0500
Subject: [PATCH 4/4] update gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 058e4bb5..f3bbd849 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@ node_modules
 .DS_Store
 .env
 coverage
-app.js