[TMP] /workspace page showing workspace files.

 On branch master
 Changes to be committed:
	modified:   server/api/optionControlFile/index.js
	modified:   server/express.js
	modified:   server/routes.js

diff --git a/server/api/optionControlFile/index.js b/server/api/optionControlFile/index.js
index 4262393..103d57d 100644 (file)
--- a/server/api/optionControlFile/index.js
+++ b/server/api/optionControlFile/index.js
@@ -5,7 +5,11 @@ var router  = express.Router();
 
 router.get('/:commandName', function(req, res) {
    var optionJSON = require(__dirname + '/../../../user-specific-files/OptionControlFile/commands/' + req.params.commandName);
-   res.send(optionJSON);
+   var info = {
+       status: 'success',
+       info: optionJSON
+   };
+   res.send(info);
 });
 
 module.exports = router;

diff --git a/server/express.js b/server/express.js
index 18cddee..d33260a 100644 (file)
--- a/server/express.js
+++ b/server/express.js
@@ -10,11 +10,10 @@ module.exports = function(app) {
     app.use(bodyParser.json());
     app.use(bodyParser.urlencoded());
 
+    app.use(express.static(__dirname + '/../front-end/dist/'))
 
     if(app.get('env') === 'development') {
-        app.use(express.static(__dirname + '/../front-end/dist/'))
         
     } else if(app.get('env') === 'production') {
-        app.use(express.static(__dirname + '../front-end/dist/'))
     }
 };

diff --git a/server/routes.js b/server/routes.js
index 8a35fc3..144f69e 100644 (file)
--- a/server/routes.js
+++ b/server/routes.js
@@ -23,10 +23,6 @@ module.exports = function(app) {
 
     app.route('/*')
     .get(function(req, res) {
-        if(app.get('env') === 'development') {
-            res.sendFile('index.html', { root: path.normalize(__dirname + '/../front-end/dist') }); 
-        } else if(app.get('env') === 'production') {
-            //res.sendFile('index.html', {root: path.normalize(__dirname + '/../dist')})
-        }
+        res.sendFile('index.html', { root: path.normalize(__dirname + '/../front-end/dist') }); 
     })
 };