Merge pull request #2 from jirrick/next

Version 0.3.0
jirrick · Oct 29, 2017 · 06a08ae · 06a08ae
2 parents e0f39ab + 6ff2851
commit 06a08ae
Show file tree

Hide file tree

Showing 24 changed files with 671 additions and 367 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,5 @@
 node_modules
 npm-debug.log
 .git
-.gitignore
+.gitignore
+env.list
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,6 +1,6 @@
 {
     "parserOptions": {
-        "ecmaVersion": 6
+        "ecmaVersion": 8
     },
     "env": {
         "node": true
@@ -12,7 +12,7 @@
             4
         ],
         "linebreak-style": [
-            "warn",
+            "off",
             "unix"
         ],
         "quotes": [

diff --git a/.gitignore b/.gitignore
@@ -60,7 +60,7 @@ typings/
 package-lock.json
 
 # do not commit real config
-config.js
+env.list
 
 # vscode launch config
 .vscode/launch.json
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM keymetrics/pm2:6
+FROM keymetrics/pm2:8
 
 # Create app directory
 WORKDIR /usr/src/quido

diff --git a/README.md b/README.md
@@ -4,5 +4,5 @@ Node.JS app for Papouch Quido modules
 ## quickstart guide
 ```
 docker pull jirrick/quidoserver:latest
-docker run -v /path/to/config.js:/usr/src/quido/src/config.js -d -p 3001:3001 jirrick/quidoserver:latest
+docker run -d -p 3001:3001 --env-file env.list jirrick/quidoserver:latest
 ```
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quido",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "quido server",
   "main": "server.js",
   "scripts": {
@@ -10,11 +10,14 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "body-parser": "^1.18.2",
+    "expr-eval": "^1.2.0",
     "express": "^4.15.4",
     "express-prettify": "0.0.8",
     "helmet": "^3.8.1",
     "mongoose": "^4.11.11",
     "round-to": "^2.0.0",
-    "strong-error-handler": "^2.2.0"
+    "strong-error-handler": "^2.2.0",
+    "winston": "^2.3.1"
   }
 }
diff --git a/pm2.json b/pm2.json
@@ -4,10 +4,12 @@
     "script": "src/server.js",
     "env": {
         "PORT": 3001,
+        "CONSOLE_LEVEL": "debug",
         "NODE_ENV": "development"
     },
     "env_production": {
         "PORT": 3001,
+        "CONSOLE_LEVEL": "verbose",
         "NODE_ENV": "production"
     }
   }]

diff --git a/src/class/boardClasses.js b/src/class/boardClasses.js
diff --git a/src/config-template.js b/src/config-template.js
diff --git a/src/controllers/appController.js b/src/controllers/appController.js
@@ -1,10 +1,9 @@
 'use strict';
 
-const environment = process.env.NODE_ENV || 'development';
+const environment = process.env.NODE_ENV || 'no-environment',
+    version = require('../../package.json').version;
 
 //Index page
 exports.main = function (req, res) {
-    res.send('Welcome to jirrick\'s quidoServer @ ' + environment);
-};
-
-//Settings page - TODO
+    res.send(`Welcome to jirrick's quidoServer v${version} @ ${environment}`);
+};