NOTICKET: Merging OSM/master to OSM/projects

[osm/UI.git] / skyquake / skyquake.js

diff --git a/skyquake/skyquake.js b/skyquake/skyquake.js
index 9b52e96..6019357 100644 (file)
--- a/skyquake/skyquake.js
+++ b/skyquake/skyquake.js
@@ -105,9 +105,12 @@ if (cluster.isMaster && clusteredLaunch) {
 
        var app = express();
 
+       app.set('views', __dirname + '/framework/core/views');
+       app.engine('html', require('ejs').renderFile);
+
        app.use(session({
          secret: 'ritio rocks',
-         resave: true,
+         resave: false,
          saveUninitialized: true
        }));
        app.use(bodyParser.json());
@@ -135,6 +138,9 @@ if (cluster.isMaster && clusteredLaunch) {
        var descriptor_routes = require('./framework/core/modules/routes/descriptorModel');
        var configuration_routes = require('./framework/core/modules/routes/configuration');
        var configurationAPI = require('./framework/core/modules/api/configuration');
+       var userManagement_routes = require('./framework/core/modules/routes/userManagement');
+       var projectManagement_routes = require('./framework/core/modules/routes/projectManagement');
+       var session_routes = require('./framework/core/modules/routes/sessions');
        /**
         * Processing when a plugin is added or modified
         * @param {string} plugin_name - Name of the plugin
@@ -156,6 +162,15 @@ if (cluster.isMaster && clusteredLaunch) {
 
        }
 
+       /**
+        * Serve jquery
+        */
+       app.use('/jquery', express.static('./node_modules/jquery/dist/jquery.min.js'));
+       /**
+        * Serve images
+        */
+       app.use('/img', express.static('./framework/style/img'));
+
        /**
         * Start listening on a port
         * @param {string} port - Port to listen on
@@ -214,6 +229,15 @@ if (cluster.isMaster && clusteredLaunch) {
                //Configure descriptor route(s)
                app.use(descriptor_routes);
 
+               //Configure user management route(s)
+               app.use(userManagement_routes);
+
+               //Configure project management route(s)
+               app.use(projectManagement_routes);
+
+               //Configure session route(s)
+               app.use(session_routes);
+
                // app.get('/testme', function(req, res) {
                //      res.sendFile(__dirname + '/index.html');
                // });