From dbd6e9db5a71e60f5c09b69a03250dee60d01b3f Mon Sep 17 00:00:00 2001
From: Sander Hautvast <shautvast@gmail.com>
Date: Mon, 20 Jan 2020 10:43:50 +0100
Subject: [PATCH] dockerized

---
 Procfile                      |  1 -
 dat                           |  2 --
 data/data.csv                 |  1 +
 encrypt                       | 20 --------------------
 package.json                  |  4 ++--
 src/public/js/trafficlight.js |  6 +++---
 src/{index.js => server.js}   |  7 ++++---
 test/test.js                  |  8 ++++----
 8 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 Procfile
 delete mode 100644 dat
 create mode 100644 data/data.csv
 delete mode 100644 encrypt
 rename src/{index.js => server.js} (78%)

diff --git a/Procfile b/Procfile
deleted file mode 100644
index 1da0cd6..0000000
--- a/Procfile
+++ /dev/null
@@ -1 +0,0 @@
-web: node index.js
diff --git a/dat b/dat
deleted file mode 100644
index 78b42d1..0000000
--- a/dat
+++ /dev/null
@@ -1,2 +0,0 @@
-2020-1-17, sander, 1
-2020-1-17, sander, 1
diff --git a/data/data.csv b/data/data.csv
new file mode 100644
index 0000000..0557367
--- /dev/null
+++ b/data/data.csv
@@ -0,0 +1 @@
+2020-1-20, sander, 1
diff --git a/encrypt b/encrypt
deleted file mode 100644
index 2ef5de4..0000000
--- a/encrypt
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const bcrypt = require('bcrypt');
-
-if (process.argv.length === 0) {
-    console.log("Usage: encrypt <password>");
-} else {
-    let plain= process.argv[2];
-    let hash=cryptPassword(plain);
-    console.log(hash);
-}
-
-function cryptPassword(password) {
-    let salt = bcrypt.genSaltSync(10);
-    return bcrypt.hashSync(password, salt);
-};
-
-function comparePassword(plainPass, hashword) {
-    return bcrypt.compareSync(plainPass, hashword);
-};
diff --git a/package.json b/package.json
index 9b969dd..ab1939b 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,9 @@
   "engines": {
     "node": "12.x"
   },
-  "main": "src/index.js",
+  "main": "src/server.js",
   "scripts": {
-    "start": "node src/index.js",
+    "start": "node src/server.js",
     "test": "node_modules/.bin/tape test/*.js"
   },
   "dependencies": {
diff --git a/src/public/js/trafficlight.js b/src/public/js/trafficlight.js
index 00c5c1d..36cfec4 100644
--- a/src/public/js/trafficlight.js
+++ b/src/public/js/trafficlight.js
@@ -18,17 +18,17 @@ function handle(event, next) {
 }
 
 function happy() {
-    emotion().value = "3";
+    emotion().value = "1";
     submit();
 }
 
 function unsure() {
-    emotion().value = "2";
+    emotion().value = "0";
     submit();
 }
 
 function sad() {
-    emotion().value = "1";
+    emotion().value = "-1";
     submit();
 }
 
diff --git a/src/index.js b/src/server.js
similarity index 78%
rename from src/index.js
rename to src/server.js
index bb376e8..c358419 100644
--- a/src/index.js
+++ b/src/server.js
@@ -2,7 +2,8 @@ const express = require('express');
 const fs = require('fs');
 const bodyParser = require('body-parser');
 const path = require('path');
-const PORT = process.env.PORT || 5000;
+const PORT = process.env.PORT || 5555;
+const DATA_PATH = process.env.DATA_PATH || "data";
 
 express()
     .use(express.urlencoded({extended: true}))
@@ -18,7 +19,7 @@ function appendToStorage(req, res) {
     if (req.body.username === '') {
         res.render('pages/error');
     } else {
-        fs.appendFile("dat", req.body.timestamp + ", " + req.body.username + ", " + req.body.emotion + "\n", err => {
+        fs.appendFile(DATA_PATH + "/data.csv", req.body.timestamp + ", " + req.body.username + ", " + req.body.emotion + "\n", err => {
             if (err) {
                 return console.log(err);
             }
@@ -28,7 +29,7 @@ function appendToStorage(req, res) {
 }
 
 function sendData(req, res) {
-    fs.readFile("dat", (err, data) => {
+    fs.readFile("data.csv", (err, data) => {
         if (err) {
             console.error(err);
             res.render('pages/error');
diff --git a/test/test.js b/test/test.js
index 1704a9c..cbd4849 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,7 +5,7 @@ const test = require('tape');
 const env = Object.assign({}, process.env, {PORT: 5000});
 
 test('main page', (assert) => {
-    const server = spawn('node', ['src/index.js'], {env});
+    const server = spawn('node', ['src/server.js'], {env});
     server.stdout.on('data', _ => {
         request('http://127.0.0.1:5000', (error, response, body) => {
             server.kill();
@@ -20,7 +20,7 @@ test('main page', (assert) => {
 });
 
 test('submit emotion', (assert) => {
-    const server = spawn('node', ['src/index.js'], {env});
+    const server = spawn('node', ['src/server.js'], {env});
     server.stdout.on('data', _ => {
         request.post({url: 'http://127.0.0.1:5000/submit-form', form:{username:'sander', password:'boompje', emotion:1, timestamp: '20191212' }}, (error, response, body) => {
             server.kill();
@@ -34,7 +34,7 @@ test('submit emotion', (assert) => {
 });
 
 test('get data', (assert) => {
-    const server = spawn('node', ['src/index.js'], {env});
+    const server = spawn('node', ['src/server.js'], {env});
     server.stdout.on('data', _ => {
         request.post({url: 'http://127.0.0.1:5000/submit-form', form:{username:'sander', password:'boompje', emotion:1, timestamp: '20191212' }});
         request('http://127.0.0.1:5000/data', (error, response, body) => {
@@ -49,7 +49,7 @@ test('get data', (assert) => {
 });
 
 test('empty submit error', (assert) => {
-    const server = spawn('node', ['src/index.js'], {env});
+    const server = spawn('node', ['src/server.js'], {env});
     server.stdout.on('data', _ => {
         request.post({url: 'http://127.0.0.1:5000/submit-form', form:{}}, (error, response, body) => {
             server.kill();