From cee48c1f45a6f84dd215a318cbe93fb443c2a863 Mon Sep 17 00:00:00 2001 From: Julien Ramel Date: Thu, 18 Aug 2016 09:18:27 +0200 Subject: [PATCH] Adding subfolder support (#186) Adding EJS Templating engine + a baseUrl variable injected in front-end. --- bin/server.js | 8 +++ front/src/js/models/resultsFactory.js | 2 +- front/src/js/models/runsFactory.js | 2 +- front/src/main.html | 74 +++++++++++------------ front/src/views/about.html | 2 +- front/src/views/dashboard.html | 2 +- front/src/views/queue.html | 4 +- front/src/views/resultSubHeader.html | 2 +- lib/server/controllers/frontController.js | 18 +++++- package.json | 1 + server_config/settings-prod.json | 2 +- server_config/settings.json | 2 +- test/fixtures/settings.json | 2 +- 13 files changed, 71 insertions(+), 50 deletions(-) diff --git a/bin/server.js b/bin/server.js index 394af07..700f527 100644 --- a/bin/server.js +++ b/bin/server.js @@ -20,6 +20,11 @@ app.use(apiLimitsMiddleware); app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded +// EJS HTML engine +app.engine('.html', require('ejs').__express); +app.set('view engine', 'ejs'); + + // Initialize the controllers var apiController = require('../lib/server/controllers/apiController')(app); var frontController = require('../lib/server/controllers/frontController')(app); @@ -28,6 +33,9 @@ var frontController = require('../lib/server/controllers/frontController // Let's start the server! if (!process.env.GRUNTED) { var settings = require('../server_config/settings.json'); + + app.locals.baseUrl = settings.baseUrl; + server.listen(settings.serverPort, function() { console.log('Listening on port %d', server.address().port); diff --git a/front/src/js/models/resultsFactory.js b/front/src/js/models/resultsFactory.js index 33b286e..dfe5a3c 100644 --- a/front/src/js/models/resultsFactory.js +++ b/front/src/js/models/resultsFactory.js @@ -1,7 +1,7 @@ var resultsFactory = angular.module('resultsFactory', ['ngResource']); resultsFactory.factory('Results', ['$resource', function($resource) { - return $resource('/api/results/:runId', { + return $resource('api/results/:runId', { }); }]); \ No newline at end of file diff --git a/front/src/js/models/runsFactory.js b/front/src/js/models/runsFactory.js index 8f4bb8e..da54bb0 100644 --- a/front/src/js/models/runsFactory.js +++ b/front/src/js/models/runsFactory.js @@ -1,7 +1,7 @@ var runsFactory = angular.module('runsFactory', ['ngResource']); runsFactory.factory('Runs', ['$resource', function($resource) { - return $resource('/api/runs/:runId', { + return $resource('api/runs/:runId', { }); }]); \ No newline at end of file diff --git a/front/src/main.html b/front/src/main.html index eb8107e..6329e68 100644 --- a/front/src/main.html +++ b/front/src/main.html @@ -2,21 +2,21 @@ Yellow Lab Tools - - - + + + - - - - - - - - - - + + + + + + + + + + @@ -33,34 +33,34 @@
@@version -
More about Yellow Lab Tools
+
More about Yellow Lab Tools
- - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + +