From cde1292535d036c5b6ded5c0a82616e57b9f65e8 Mon Sep 17 00:00:00 2001 From: cgeek <cem.moreau@gmail.com> Date: Thu, 31 Mar 2016 22:51:31 +0200 Subject: [PATCH] Add peers view --- app/js/app.config.js | 1 + app/js/controllers/main/home/HomeController.js | 4 +++- .../main/home/tabs/OverviewController.js | 2 -- app/js/lib/conf/i18n/en.json | 2 ++ app/js/lib/conf/routes.js | 14 ++++++++++++++ app/js/services/bma.js | 2 +- app/views/main/home/home.jade | 6 +++--- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/js/app.config.js b/app/js/app.config.js index fdb1310..b78613b 100644 --- a/app/js/app.config.js +++ b/app/js/app.config.js @@ -25,6 +25,7 @@ module.exports = () => { homeControllers.controller('MainController', require('./controllers/main/MainController')); homeControllers.controller('HomeController', require('./controllers/main/home/HomeController')); homeControllers.controller('OverviewController', require('./controllers/main/home/tabs/OverviewController')); + homeControllers.controller('HomeNetworkController', require('./controllers/main/home/tabs/HomeNetworkController')); homeControllers.controller('LogsController', require('./controllers/main/home/tabs/LogsController')); homeControllers.controller('NetworkController', require('./controllers/main/settings/tabs/NetworkController')); homeControllers.controller('SettingsController', require('./controllers/main/settings/SettingsController')); diff --git a/app/js/controllers/main/home/HomeController.js b/app/js/controllers/main/home/HomeController.js index ad31866..2fcba97 100644 --- a/app/js/controllers/main/home/HomeController.js +++ b/app/js/controllers/main/home/HomeController.js @@ -1,6 +1,8 @@ "use strict"; -module.exports = ($scope) => { +module.exports = ($scope, UIUtils) => { + + UIUtils.enableTabs(); $scope.$parent.menu = 'home'; }; diff --git a/app/js/controllers/main/home/tabs/OverviewController.js b/app/js/controllers/main/home/tabs/OverviewController.js index 7855e77..8e1c65b 100644 --- a/app/js/controllers/main/home/tabs/OverviewController.js +++ b/app/js/controllers/main/home/tabs/OverviewController.js @@ -2,8 +2,6 @@ module.exports = ($scope, BMA, UIUtils, summary, bmapi, ws) => { - UIUtils.enableTabs(); - let co = require('co'); bindBlockWS(); diff --git a/app/js/lib/conf/i18n/en.json b/app/js/lib/conf/i18n/en.json index 95fa79a..47a7ea9 100644 --- a/app/js/lib/conf/i18n/en.json +++ b/app/js/lib/conf/i18n/en.json @@ -90,6 +90,8 @@ "home.current.mmass": "Monetary mass", "home.tabs.overview": "Overview", "home.tabs.overview.should_reconfigure": "Your configuration has changed and your node is no more reachable from the network. You should reconfigure it to have a functional node.", + "home.tabs.network": "Peers", + "home.tabs.network.button.update": "Check peers again", "home.tabs.logs": "Logs", "home.tabs.logs.follow.logs": "Follow logs", "home.tabs.logs.pause.logs": "Pause logs", diff --git a/app/js/lib/conf/routes.js b/app/js/lib/conf/routes.js index 684f835..986c0e8 100644 --- a/app/js/lib/conf/routes.js +++ b/app/js/lib/conf/routes.js @@ -119,6 +119,20 @@ module.exports = (app) => { controller: 'OverviewController' }). + state('main.home.network', { + url: '/network', + template: require('views/main/home/tabs/network'), + resolve: { + bmapi: (BMA, summary) => co(function *() { + return BMA.instance(summary.host); + }), + peers: (bmapi) => co(function *() { + return bmapi.network.peers(); + }) + }, + controller: 'HomeNetworkController' + }). + state('main.settings', { abstract: true, url: '/settings', diff --git a/app/js/services/bma.js b/app/js/services/bma.js index 79b98b9..e5aef08 100644 --- a/app/js/services/bma.js +++ b/app/js/services/bma.js @@ -93,7 +93,7 @@ module.exports = (angular) => { if (res.type == 'log') { for (let i = 0, len = res.value.length; i < len; i++) { let log = res.value[i]; - console[log.level](log.msg); + // console[log.level](log.msg); } } if (listener && (messageType === undefined || (res.type === messageType))) { diff --git a/app/views/main/home/home.jade b/app/views/main/home/home.jade index 32e3a6e..52cbd98 100644 --- a/app/views/main/home/home.jade +++ b/app/views/main/home/home.jade @@ -7,8 +7,8 @@ main.home-main.main-screen li.tab.col.s3: a(href="#main.home.overview") i.fa.fa-photo = " {{ 'home.tabs.overview' | translate }}" - //li.tab.col.s3: a(href="#main.home.logs") - // i.fa.fa-newspaper-o - // = " {{ 'home.tabs.logs' | translate }}" + li.tab.col.s3: a(href="#main.home.network") + i.fa.fa-globe + = " {{ 'home.tabs.network' | translate }}" div.ui-scrollable(ui-view="") \ No newline at end of file -- GitLab