2.3.0 Feedback

Author: ljungmark

index.html

@@ -371,6 +371,14 @@ <h2 data-lang="review.header"></h2>
         <div class="module _hidden" data-module="docket">
           <div class="-eggs"></div>
           <h2 class="-text" data-lang="docket.done"></h2>
+          <div class="feedback">
+            <h3 class="-text" data-lang="docket.feedback"></h3>
+            <a class="-send" href="#" data-feedback="-2" data-lang="docket.toosoft"></a>
+            <a class="-send" href="#" data-feedback="-1" data-lang="docket.soft"></a><br>
+            <a class="-send -perfect" href="#" data-feedback="0" data-lang="docket.perfect"></a><br>
+            <a class="-send" href="#" data-feedback="1" data-lang="docket.hard"></a>
+            <a class="-send" href="#" data-feedback="2" data-lang="docket.toohard"></a>
+          </div>
         </div>
       </div>
     </main>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eggup",
-  "version": "2.0.0",
+  "version": "2.3.0",
   "description": "Order breakfast eggs at the Silverspin office",
   "main": "server.js",
   "scripts": {
@@ -12,7 +12,7 @@
     "url": "git+https://github.com/ljungmark/eggup-node.git"
   },
   "author": "twitter.com/ljungmark",
-  "license": "Creative Commons Attribution-NonCommercial-ShareAlike 3.0 (CC BY-NC-SA 3.0)",
+  "license": "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 (CC BY-NC-SA 4.0)",
   "bugs": {
     "url": "https://github.com/ljungmark/eggup-node/issues"
   },
@@ -26,7 +26,7 @@
     "passport": "^0.3.2",
     "passport-facebook": "^2.1.1",
     "passport-github2": "^0.1.10",
-    "passport-google-oauth20": "^1.0.0",
+    "passport-linkedin": "^1.0.0",
     "passport-reddit": "^0.2.4",
     "passport-spotify": "^0.3.1",
     "passport-steam": "^1.0.8",

server.js

@@ -370,6 +370,7 @@ app.post('/synchronize', (request, response) => {
       'past_hard': null,
       'quantity': 0,
       'variant': 0,
+      'feedback': null,
       'tokenstamp': null,
       'heap_1': 0,
       'heap_2': 0,
@@ -401,7 +402,7 @@ app.post('/synchronize', (request, response) => {
       model.hardboiled = results[0].hardboiled;
     }
 
-    sql = 'SELECT date, quantity, variant FROM orders WHERE token = ? AND DATE(date) = ?',
+    sql = 'SELECT date, quantity, variant, feedback FROM orders WHERE token = ? AND DATE(date) = ?',
       values = [request.user.token, date];
     sql = mysql.format(sql, values);
 
@@ -411,6 +412,7 @@ app.post('/synchronize', (request, response) => {
       if (results.length) {
         model.quantity = results[0].quantity;
         model.variant = results[0].variant;
+        model.feedback = results[0].feedback;
         model.tokenstamp = results[0].date.substring(0, 10);
       }
 
@@ -774,6 +776,47 @@ app.post('/controller', (request, response) => {
   });
 });
 
+
+
+/**
+  Recieve feedback
+
+  Example
+  {
+    'result': false,
+  }
+*/
+app.post('/feedback', (request, response) => {
+  const date = get_date();
+
+  const model = {
+    'result': false
+  }
+
+  let value = request.body.value;
+
+  let check = new Promise(function(resolve, reject) {
+    sql = 'UPDATE orders SET feedback = ? WHERE token = ? AND DATE(date) = ?';
+    sql = mysql.format(sql, [value, request.user.token, date]);
+
+    pool.query(sql, function (error, results, fields) {
+      if (error) reject();
+
+      if (results.affectedRows) {
+        model.result = true;
+
+        resolve();
+      } else {
+        reject();
+      }
+    });
+  }).then(function(exists) {
+    response.send(JSON.stringify(model));
+  }).catch(function() {
+    response.send(JSON.stringify(model));
+  });
+});
+
 /**
  * Set up broadcasting emitters
  */

static/eggup.css

@@ -1188,6 +1188,42 @@ h2 {
   width: 100%;
 }
 
+.feedback .-send {
+  background: #ffffff;
+  border: #666666 2px solid;
+  border-radius: 6px;
+  color: #222222;
+  cursor: pointer;
+  display: inline-block;
+  margin: 0;
+  overflow: hidden;
+  padding: 8px 10px 12px;
+  position: relative;
+  text-decoration: none;
+  transition: all .5s ease;
+}
+.feedback .-send.-perfect {
+  margin: 10px 0;
+  padding: 16px 36px 17px;
+}
+.feedback .-send._confirmed {
+  background: #ffeb3b;
+}
+.feedback .-send:after {
+  backface-visibility: hidden;
+  background-image: repeating-linear-gradient(135deg, #666, #666 1px, transparent 2px, transparent 5px);
+  background-size: 7px 7px;
+  border-top: 1px solid #666;
+  bottom: 0;
+  content: '';
+  display: block;
+  height: 3px;
+  left: 0;
+  position: absolute;
+  width: 100%;
+  -webkit-backface-visibility: hidden;
+}
+
 .dancing {
   display: none;
   left: 50%;

static/eggup.js

@@ -383,6 +383,24 @@ Eggup.prototype.synchronize = function() {
 
           if (startdate < current_date) {
             /** Countdown is finished */
+            if (json.quantity == 0) {
+              egg_markup = `
+                <div class="egg _docket">
+                  <div class="yolk">
+                    <div class="face">
+                      <div class="eyes"></div>
+                      <div class="mouth"></div>
+                    </div>
+                  </div>
+                </div>`;
+
+              document.querySelector('.-eggs').innerHTML = egg_markup;
+              document.querySelector('.feedback').parentNode.removeChild(document.querySelector('.feedback'));
+            } else {
+              const valid_feedback = ['-2', '-1', '0', '1', '2'];
+              if (valid_feedback.includes(json.feedback)) document.querySelector(`.feedback .-send[data-feedback="${json.feedback}"]`).classList.add('_confirmed');
+            }
+
             instance.load('docket');
           } else {
             /** There's still time left on the timer */
@@ -415,7 +433,7 @@ Eggup.prototype.synchronize = function() {
     });
   });
 
-  console.log('%c Eggup 2.2.8 ', [
+  console.log('%c Eggup 2.3.0 ', [
     'background: linear-gradient(-180deg, #44b1e8, #3098de)',
     'border-radius: 3px',
     'box-shadow: 0 1px 0 0 rgba(46,86,153,.15), inset 0 1px 0 0 rgba(46,86,153,.1), inset 0 -1px 0 0 rgba(46,86,153,.4);',
@@ -637,23 +655,11 @@ Eggup.prototype.load = function(target_module) {
   /** Finish all map nodes when orders are done */
   (target_module == 'docket') ? eggup.map(target_module_index + 1) : eggup.map(target_module_index);
 
-  if (target_module == 'docket' &&  !document.querySelector('.egg._docket')) {
+  if (target_module == 'docket') {
     if (document.querySelector('.wrapper > .egg')) {
       document.querySelector('.wrapper').removeChild(document.querySelector('.egg'));
       clearTimeout(window.bubble);
     }
-
-    egg_markup = `
-      <div class="egg _docket">
-        <div class="yolk">
-          <div class="face">
-            <div class="eyes"></div>
-            <div class="mouth"></div>
-          </div>
-        </div>
-      </div>`;
-
-    document.querySelector('.-eggs').innerHTML = egg_markup;
   }
 
   /** Never load a module while not scrolled to the top */
@@ -884,7 +890,13 @@ Eggup.prototype.i18n = function(operation = 'get', pointer = null) {
           'done': 'All done'
         },
         'docket': {
-          'done': 'The eggs are done, enjoy!'
+          'done': 'The eggs are done, enjoy!',
+          'feedback': 'What\'d you think of the eggs?',
+          'toosoft': 'Way too soft boiled',
+          'soft': 'A bit too soft boiled',
+          'perfect': 'Perfect',
+          'hard': 'A bit too hard boiled',
+          'toohard': 'Way too hard boiled'
         }
       },
       /** Swedish */
@@ -959,7 +971,13 @@ Eggup.prototype.i18n = function(operation = 'get', pointer = null) {
           'done': 'Färdiga'
         },
         'docket': {
-          'done': 'Äggen är klara, hugg in!'
+          'done': 'Äggen är klara, hugg in!',
+          'feedback': 'Vad tyckte du om dina ägg idag?',
+          'toosoft': 'Alldeles för löskokta',
+          'soft': 'Lite för löskokta',
+          'perfect': 'Perfekt!',
+          'hard': 'Lite för hårdkokta',
+          'toohard': 'Alldeles för hårdkokta'
         }
       }
     };
@@ -1861,6 +1879,42 @@ document.addEventListener('DOMContentLoaded', function() {
     return false;
   };
 
+  document.querySelectorAll('.feedback').forEach(element => {
+    element.onclick = (event) => {
+      if (eggup.module != 'docket') return false;
+
+        let value = event.target.dataset.feedback;
+
+        let feedback_request = new Promise(function(resolve, reject) {
+          fetch('/feedback', {
+            method: 'post',
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded'
+            },
+            body: serialize({ 'value': value }),
+            credentials: 'include'
+          }).then(function(response) {
+            return response.json().then(function(json) {
+              resolve(json);
+            });
+          });
+        });
+
+        feedback_request.then((response) => {
+          if (Object.values(response)[0] == true) {
+
+            document.querySelectorAll('.feedback .-send._confirmed').forEach(element => element.classList.remove(`_confirmed`));
+            event.target.classList.add(`_confirmed`);
+
+          } else {
+            eggup.error();
+          }
+        });
+
+      return false;
+    };
+  });
+
   /** Add shadow on containers when scrolled */
   document.querySelectorAll('.container').forEach(function(element) {
     let current_element = element;