From 6fe1cbd9e70e231fddd86cd32291901a51b6ef98 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Fri, 25 Mar 2016 14:05:41 +0100
Subject: [PATCH] Now show IP+port listened by the node during currency
creation + use UPnP
---
app/js/controllers/init/create/RootBlockController.js | 11 ++++++++++-
app/js/lib/conf/i18n/en.json | 1 +
app/js/services/bma.js | 3 ++-
app/styles/main.styl | 6 ++++++
app/views/init/create/create_root.jade | 4 ++++
5 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/app/js/controllers/init/create/RootBlockController.js b/app/js/controllers/init/create/RootBlockController.js
index e2cb6ed..2dacc27 100644
--- a/app/js/controllers/init/create/RootBlockController.js
+++ b/app/js/controllers/init/create/RootBlockController.js
@@ -21,11 +21,20 @@ module.exports = ($scope, $http, $state, BMA) => {
$scope.start = () => co(function *() {
try {
- yield BMA.webmin.server.http.start();
+ let hosts = [];
+ if ($scope.$parent.conf.remote_ipv4) {
+ hosts.push([$scope.$parent.conf.remote_ipv4, $scope.$parent.conf.rport].join(':'));
+ }
+ if ($scope.$parent.conf.remote_ipv6) {
+ hosts.push(["[" + $scope.$parent.conf.remote_ipv6 + "]", $scope.$parent.conf.rport].join(':'));
+ }
+ $scope.host_listening = hosts.join('\n');
$scope.started = true;
yield BMA.webmin.server.sendConf({
conf: $scope.$parent.conf
});
+ yield BMA.webmin.server.http.start();
+ yield BMA.webmin.server.http.openUPnP();
yield $scope.try();
} catch (e) {
$scope.message = e.message;
diff --git a/app/js/lib/conf/i18n/en.json b/app/js/lib/conf/i18n/en.json
index a297a97..7285d45 100644
--- a/app/js/lib/conf/i18n/en.json
+++ b/app/js/lib/conf/i18n/en.json
@@ -79,6 +79,7 @@
"configuration.create_root.need_a_try": "You need to generate a first block with the « Give a try » button. Start HTTP server to do so.",
"configuration.create_root.button.accept_and_send": "Accept this block and start currency",
"configuration.create_root.button.cancel": "Cancel creation and go to home screen",
+ "configuration.create_root.host_listening": "Host listening at:",
"configuration.create_uid.pubkey_preview": "Public key preview",
"home.current.number": "Current block #",
"home.current.membersCount": "Members count",
diff --git a/app/js/services/bma.js b/app/js/services/bma.js
index 6c3fa8e..0875b3b 100644
--- a/app/js/services/bma.js
+++ b/app/js/services/bma.js
@@ -124,7 +124,8 @@ module.exports = (angular) => {
server: {
http: {
start: getResource('/webmin/server/http/start'),
- stop: getResource('/webmin/server/http/stop')
+ stop: getResource('/webmin/server/http/stop'),
+ openUPnP: getResource('/webmin/server/http/upnp/open')
},
services: {
startAll: getResource('/webmin/server/services/start_all'),
diff --git a/app/styles/main.styl b/app/styles/main.styl
index 38f2599..f695209 100644
--- a/app/styles/main.styl
+++ b/app/styles/main.styl
@@ -122,6 +122,12 @@ nav
background-color #d7edf5
line-height 60px
+.host_listening
+ background-color #d7edf5
+ line-height 21px
+ padding-top 20px
+ padding-bottom 20px
+
blockquote
padding-top 10px
padding-bottom 10px
diff --git a/app/views/init/create/create_root.jade b/app/views/init/create/create_root.jade
index 1b7097e..1b8d450 100644
--- a/app/views/init/create/create_root.jade
+++ b/app/views/init/create/create_root.jade
@@ -23,6 +23,10 @@
.card-action
+ .container(ng-if="host_listening")
+ h5(translate="configuration.create_root.host_listening")
+ pre.host_listening {{ host_listening }}
+
pre.card-panel.teal.white-text.code.left-align.small(ng-show="generated") {{ generated }}
blockquote.card-panel.left-align(ng-show="message") {{ message | translate }}
--
GitLab