Merge pull request #7 from openpearl/develop

Moving to v1.0.0

.gitignore

@@ -1,3 +1,5 @@
+*.swp
+
 # Logs
 logs
 *.log
@@ -26,4 +28,9 @@ build/Release
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
 
-.DS_Store
+.DS_Store
+
+files/input.json
+
+public/script.js
+public/style.css

app.js

@@ -1,16 +1,45 @@
 // Dependencies.
+var fs = require('fs');
 var express = require('express');
 var path = require('path');
 var logger = require('morgan');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
+var multer = require('multer');
 
 var app = express();
 var PORT = process.env.PORT || 3000;
 
 app.use(logger('dev'));
+// app.use(bodyParser());
 app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false }));
+// app.use(bodyParser.urlencoded());
+app.use(bodyParser.urlencoded({ extended: true }));
+
+// Multer settings.
+// https://codeforgeek.com/2014/11/file-uploads-using-node-js/
+var done = false;
+app.use(multer({
+  dest: './files/',
+  onError: function (error, next) {
+    console.log(error);
+    next(error);
+  },
+  onParseStart: function() {
+    console.log("On parse start.");
+  },
+  rename: function (fieldname, filename) {
+    return 'input';
+  },
+  onFileUploadStart: function (file) {
+    console.log(file.originalname + ' is starting ...');
+  },
+  onFileUploadComplete: function (file) {
+    console.log(file.fieldname + ' uploaded to  ' + file.path);
+    done=true;
+  }
+}));
+
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 app.use('/bower_components',  express.static(__dirname + '/bower_components'));
@@ -22,4 +51,22 @@ app.get('/', function (req, res) {
   res.status(200).json({});
 });
 
+app.post('/save', function (req, res) {
+  var stringed = JSON.stringify(req.body);
+
+  fs.writeFile('./files/input.json', stringed, function (err) {
+    if (err) return console.log(err);
+    console.log('file saved!');
+
+    res.status(200).end();
+  });
+
+});
+
+app.post('/files/processedTree', function (req, res) {
+  if (done==true) {
+    res.redirect('/');    
+  }
+});
+
 app.listen(PORT, "0.0.0.0");

files/input2.json

@@ -0,0 +1,45 @@
+{
+  "root": {
+    "cardID": "root",
+    "childrenCardIDs": [
+      "b4a20b31_66c0_a994_71dc_432fd7850ba1",
+      "a4093f548_26b3_d665_c80b_31b510cfe09f",
+      "de6a9bee_5174_e2be_780c_1b896be501f9"
+    ],
+    "speaker": "",
+    "message": "You're at ___mins of activity for today (below personal average/30mins)"
+  },
+  "b4a20b31_66c0_a994_71dc_432fd7850ba1": {
+    "cardID": "b4a20b31_66c0_a994_71dc_432fd7850ba1",
+    "childrenCardIDs": [
+      "a7ba70d62_ae21_dbdc_d06f_262e351c8489",
+      "a2ab08d5a_646a_486f_9552_a9290eb22b06"
+    ],
+    "speaker": "",
+    "message": "You've gotten ___mins of activity so far today! (personal average/30mins)"
+  },
+  "a4093f548_26b3_d665_c80b_31b510cfe09f": {
+    "cardID": "a4093f548_26b3_d665_c80b_31b510cfe09f",
+    "childrenCardIDs": [],
+    "speaker": "",
+    "message": "You're at"
+  },
+  "de6a9bee_5174_e2be_780c_1b896be501f9": {
+    "cardID": "de6a9bee_5174_e2be_780c_1b896be501f9",
+    "childrenCardIDs": [],
+    "speaker": "",
+    "message": "___mins of activity so far today (above personal average/30mins)"
+  },
+  "a7ba70d62_ae21_dbdc_d06f_262e351c8489": {
+    "cardID": "a7ba70d62_ae21_dbdc_d06f_262e351c8489",
+    "childrenCardIDs": [],
+    "speaker": "",
+    "message": "You've still got ___mins to go to get to your 30 mins of activity for the day!"
+  },
+  "a2ab08d5a_646a_486f_9552_a9290eb22b06": {
+    "cardID": "a2ab08d5a_646a_486f_9552_a9290eb22b06",
+    "childrenCardIDs": [],
+    "speaker": "",
+    "message": "You haven't been as active as you normally are by now."
+  }
+}

package.json

@@ -17,9 +17,11 @@
   },
   "dependencies": {
     "body-parser": "^1.11.0",
+    "busboy": "^0.2.9",
     "cookie-parser": "^1.3.3",
     "express": "^4.11.2",
-    "morgan": "^1.5.1"
+    "morgan": "^1.5.1",
+    "multer": "^0.1.8"
   },
   "devDependencies": {
     "autoprefixer-core": "^5.2.0",

public/index.html

@@ -1,3 +1,5 @@
+<!doctype html>
+
 <html>
 <head>
   <meta charset="UTF-8">
@@ -11,8 +13,10 @@
 
   <script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/react/0.13.3/react.js"></script>
-  <script src="//cdn.rawgit.com/tbem/jquery.line/master/jquery.line.js"></script>
   <script src="//cdnjs.cloudflare.com/ajax/libs/react-router/0.13.3/ReactRouter.min.js"></script>
+  <!-- <script src="https://cdn.rawgit.com/sporritt/jsPlumb/master/dist/js/dom.jsPlumb-1.7.5-min.js"></script> -->
+  <script src="https://cdn.rawgit.com/sporritt/jsPlumb/master/dist/js/dom.jsPlumb-1.7.5.js"></script>
+  <script src="https://cdn.rawgit.com/timmywil/jquery.panzoom/master/dist/jquery.panzoom.min.js"></script>
   <script src="/bower_components/classnames/index.js"></script>
 
   <script src="script.js"></script>