Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 0f141b1

Browse files
author
ameliagoodman
committed
add connected peers
1 parent 313c8df commit 0f141b1

File tree

3 files changed

+62
-0
lines changed

3 files changed

+62
-0
lines changed

css/obBase.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6400,3 +6400,13 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
64006400
#ov1 .TODO.TODO.TODO.TODO.TODO {
64016401
display: none; /* hide in production */
64026402
}
6403+
6404+
6405+
.js-connectedPeers {
6406+
line-height: 20px;
6407+
margin-top: 10px;
6408+
display: block;
6409+
color: #9999A0;
6410+
height: 200px;
6411+
overflow: scroll
6412+
}

js/templates/settings.html

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,6 +1260,35 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
12601260
</div>
12611261
</div>
12621262

1263+
</div>
1264+
<div class="flexRow">
1265+
1266+
<div class="flexCol-3 borderRight custCol-border">
1267+
<div class="fieldItem">
1268+
<label>
1269+
Connected Peers
1270+
</label>
1271+
</div>
1272+
</div>
1273+
1274+
<div class="flexCol-9 borderRight0 custCol-border">
1275+
<div class="fieldItem flexRow">
1276+
<div class="flexRow">
1277+
<div class="flexCol-9">
1278+
<span class="js-numConnectedPeers"></span>
1279+
</div>
1280+
<div class="positionTopRight paddingright5">
1281+
<a id="showPeersButton" class="btn btn-txt js-showPeers custCol-secondary">
1282+
Show Connected Peers
1283+
</a>
1284+
</div>
1285+
</div>
1286+
<div class="flexRow">
1287+
<div style="white-space: pre;"><span class="js-connectedPeers"></span></div>
1288+
</div>
1289+
</div>
1290+
</div>
1291+
12631292
</div>
12641293

12651294
<div class="flexRow">

js/views/settingsVw.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ module.exports = pageVw.extend({
4747
'click .js-saveModerator': 'saveModeratorClick',
4848
'click .js-cancelAdvanced': 'cancelView',
4949
'click .js-saveAdvanced': 'saveAdvancedClick',
50+
'click .js-showPeers': 'showPeers',
5051
'click .js-testSMTP': 'testSMTPClick',
5152
'click .js-changeServerSettings': 'launchServerConfig',
5253
'change .js-settingsThemeSelection': 'themeClick',
@@ -134,6 +135,8 @@ module.exports = pageVw.extend({
134135
this.listenTo(app.router, 'cache-reattached', this.onCacheReattached);
135136

136137
__.bindAll(this, 'validateDescription');
138+
139+
137140
},
138141

139142
// disabling caching on settings for now -- too much
@@ -236,6 +239,22 @@ module.exports = pageVw.extend({
236239
placeholder_text_multiple: window.polyglot.t('chosenJS.placeHolderTextMultiple')
237240
});
238241

242+
var connectedPeers = ""
243+
$.ajax({
244+
url: self.serverUrl+ "routing_table",
245+
success: function(data){
246+
self.$el.find('span.js-numConnectedPeers').text(data.length);
247+
data.forEach(function (peer) {
248+
connectedPeers += (peer['ip'] + ":" + peer['port'] + "\n");
249+
})
250+
self.$el.find('span.js-connectedPeers').text(connectedPeers);
251+
$('.js-connectedPeers').hide();
252+
},
253+
error: function(){
254+
self.$el.find('.js-numConnectedPeers').text("Call to peers API failed.");
255+
}
256+
});
257+
239258
self.avatarCropper = self.$('#settings-image-cropper');
240259

241260
self.avatarCropper.cropit({
@@ -323,6 +342,10 @@ module.exports = pageVw.extend({
323342
return this;
324343
},
325344

345+
showPeers: function () {
346+
$('.js-connectedPeers').toggle();
347+
},
348+
326349
validateDescription: function() {
327350
validateMediumEditor.checkVal(this.$('#about'));
328351
},

0 commit comments

Comments
 (0)