From 277b31c276b2e731171cbf87b6d4fdac495511a2 Mon Sep 17 00:00:00 2001 From: ThinkRedstone Date: Sat, 19 Aug 2017 19:51:24 +0300 Subject: [PATCH 1/5] added address.js --- server_modules/address.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 server_modules/address.js diff --git a/server_modules/address.js b/server_modules/address.js new file mode 100644 index 00000000..31e81981 --- /dev/null +++ b/server_modules/address.js @@ -0,0 +1,19 @@ +var os = require('os'); +var args = require('./args') + +//shamelessly copied from StackOverflow with only minor changes +var interfaces = os.networkInterfaces(); +var addresses = []; +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, we add it + addresses.push(address.address); + } + } +} + +exports.middleware = function (req, res, next) { + req.session.serverAddress = addresses[0] + ':' + args.port; //we set the server address to the first one. In reality, any of them would work + next(); +}; From 1caaabc7c98ff5df237d15b824f365b2034b5f4f Mon Sep 17 00:00:00 2001 From: ThinkRedstone Date: Sat, 19 Aug 2017 19:52:34 +0300 Subject: [PATCH 2/5] registered address.js 's middleware in localserver.js --- localserver.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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, From 8b3489f8d905f1439e9ddb4f6bfc2928426bb192 Mon Sep 17 00:00:00 2001 From: ThinkRedstone Date: Sat, 19 Aug 2017 20:02:36 +0300 Subject: [PATCH 3/5] added server's address on the top of the drawer --- src/js/main.js | 2 ++ src/views/drawer.html | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) 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..593d5837 100644 --- a/src/views/drawer.html +++ b/src/views/drawer.html @@ -1,9 +1,9 @@ -
-
-
- -
\ No newline at end of file +
+
+ address: {{serverAddress}}
+ +
From dc3dc64de3a547c3998ba6ae22e87507efac4860 Mon Sep 17 00:00:00 2001 From: ThinkRedstone Date: Sun, 20 Aug 2017 18:56:27 +0300 Subject: [PATCH 4/5] Moved css text properties from tag to css file --- src/css/elements.css | 2 ++ src/views/drawer.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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/views/drawer.html b/src/views/drawer.html index 593d5837..c5eafc88 100644 --- a/src/views/drawer.html +++ b/src/views/drawer.html @@ -1,5 +1,5 @@
-
+
address: {{serverAddress}}
  • From d93943dc0fc9dea7ff9ff99ea6faf0d083391e07 Mon Sep 17 00:00:00 2001 From: ThinkRedstone Date: Sun, 20 Aug 2017 19:01:37 +0300 Subject: [PATCH 5/5] address.js now only finds and saves one address --- server_modules/address.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server_modules/address.js b/server_modules/address.js index 31e81981..1c02ed45 100644 --- a/server_modules/address.js +++ b/server_modules/address.js @@ -3,17 +3,18 @@ var args = require('./args') //shamelessly copied from StackOverflow with only minor changes var interfaces = os.networkInterfaces(); -var addresses = []; +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, we add it - addresses.push(address.address); + 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 = addresses[0] + ':' + args.port; //we set the server address to the first one. In reality, any of them would work + req.session.serverAddress = serverAddress + ':' + args.port; next(); };