diff --git a/app/js/controllers/init/create/RootBlockController.js b/app/js/controllers/init/create/RootBlockController.js index e2cb6ed42794dd4ceae45c4c2f4f18055b54ca9d..2dacc27982d4afa713faebaee65b9c66ba3ad26e 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 a297a97a959cac6eefb49f1408350c134139527a..7285d45968e210a11be4904a452c3027986d7835 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 6c3fa8e4b41c1ef7592bd648358ad1b25b5365bb..0875b3b55004f28e57fd82d4094585a464962c3c 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 38f2599f06060e48cf2353b0c1c3f30ded610cb2..f695209882a07b5e0f9d0a6adde4a6d7d0febafc 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 1b7097e6343251ee2f9ff375a2f9360eaee7572c..1b8d450971e8a188c17b3ae564ce2cd95d423b89 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 }}