diff --git a/localserver.js b/localserver.js index add3d0c2..ec8723a9 100644 --- a/localserver.js +++ b/localserver.js @@ -13,7 +13,8 @@ var middlewareLayers = [express.static(fileSystem.resolve('src')), require('./server_modules/cors').middleware, require('./server_modules/cache').middleware, require('./server_modules/body_builder').middleware, - require('./server_modules/log').middleware]; + require('./server_modules/log').middleware, + require('./server_modules/address').middleware]; var routers = [views, fileSystem, diff --git a/server_modules/address.js b/server_modules/address.js new file mode 100644 index 00000000..1c02ed45 --- /dev/null +++ b/server_modules/address.js @@ -0,0 +1,20 @@ +var os = require('os'); +var args = require('./args') + +//shamelessly copied from StackOverflow with only minor changes +var interfaces = os.networkInterfaces(); +var serverAddress = ""; +for (var i in interfaces) { + for (var j in interfaces[i]) { + var address = interfaces[i][j];//we basically parse over all the addresses for every network interface + if (address.family === 'IPv4' && !address.internal) {//if that address is an IPv4 address, and it is not an internal one, that's the address we are looking for + serverAddress = address.address; + break; + } + } +} + +exports.middleware = function (req, res, next) { + req.session.serverAddress = serverAddress + ':' + args.port; + next(); +}; diff --git a/src/css/elements.css b/src/css/elements.css index e4f8cbe6..0be9bfa4 100644 --- a/src/css/elements.css +++ b/src/css/elements.css @@ -127,6 +127,8 @@ table { box-shadow: 0 2px 5px rgba(0,0,0,0.26); } .drawer .drawerLead { + text-align: center; + color: darkblue; /*height: 156px;*/ height: 64px; /*background-color: red;*/ diff --git a/src/js/main.js b/src/js/main.js index c73daced..bca72216 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -36,6 +36,8 @@ define([ $scope.drawerVisible = false; session.onload(function() { + $scope.serverAddress = session.get('serverAddress'); + $scope.user = session.get('user'); if($scope.user === 'admin') { $scope.pages = [ diff --git a/src/views/drawer.html b/src/views/drawer.html index 4135fe3d..c5eafc88 100644 --- a/src/views/drawer.html +++ b/src/views/drawer.html @@ -1,9 +1,9 @@ -