ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show more live stats in P2P Server selection

fix-non-showing-inputs
Moe Alam 2020-10-08 17:01:23 -07:00
parent d462978454
commit 862bcb4d1d
4 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
languages/en_CA.json
View File

@ -55,6 +55,9 @@
"Time-lapse": "Time-lapse",
"Montage": "Montage",
"Registered": "Registered",
"Viewing Server Stats": "Viewing Server Stats",
"Connected Users": "Connected Users",
"Registered Servers": "Registered Servers",
"Open All Monitors": "Open All Monitors",
"Accounts": "Accounts",
"Settings": "Settings",

3
libs/commander/worker.js
View File

@ -25,7 +25,7 @@ parentPort.on('message',(data) => {
initialize(data.config,data.lang)
break;
case'exit':
s.debugLog('Exiting...')
s.debugLog('Closing P2P Connection...')
process.exit(0)
break;
}
@ -153,6 +153,7 @@ const initialize = (config,lang) => {
auth: user.auth_token,
ke: user.ke,
uid: user.uid,
ipAddress: rawRequest.ipAddress
})
});
([

6
web/libs/js/super.easyRemoteAccess.js
View File

@ -32,6 +32,9 @@ $(document).ready(function(){
var cpuCoresEl = cardEl.find('.cpuCores')
var networkUseDownEl = cardEl.find('.networkUseDown')
var networkUseUpEl = cardEl.find('.networkUseUp')
var chartViewerCount = cardEl.find('.chartViewerCount')
var connectedUsers = cardEl.find('.connectedUsers')
var registeredServers = cardEl.find('.registeredServers')
var socketConnection = io(`ws://${server.host}:${server.p2pPort}`,{
transports: ['websocket'],
query: {
@ -48,6 +51,9 @@ $(document).ready(function(){
cpuUsageEl.text(data.cpu)
ramUsedEl.text(data.ram.used)
ramPercentEl.text(data.ram.percent)
registeredServers.text(data.servers)
connectedUsers.text(data.users)
chartViewerCount.text(data.statViewers)
})
}
function disableForm(){

15
web/pages/blocks/easyRemoteAccess.ejs
View File

@ -98,6 +98,21 @@
<td class="text-left epic-text epic-text-filter"><span class="ramTotal"><i class="fa fa-spinner fa-pulse"></i></span> <%- lang.RAM %></td>
<td class="text-right"><span class="info-badge badge badge-sm badge-default"><span class="ramPercent"><i class="fa fa-spinner fa-pulse"></i></span>%, <span class="ramUsed"><i class="fa fa-spinner fa-pulse"></i></span> MB</span></td>
</tr>
<tr title="Registered Servers">
<td><i class="fa fa-database"></i></td>
<td class="text-left epic-text epic-text-filter"><%- lang['Registered Servers'] %></td>
<td class="text-right"><span class="info-badge badge badge-sm badge-default"><span class="registeredServers"><i class="fa fa-spinner fa-pulse"></i></span></td>
</tr>
<tr title="Connected Users">
<td><i class="fa fa-user"></i></td>
<td class="text-left epic-text epic-text-filter"><%- lang['Connected Users'] %></td>
<td class="text-right"><span class="info-badge badge badge-sm badge-default"><span class="connectedUsers"><i class="fa fa-spinner fa-pulse"></i></span></td>
</tr>
<tr title="Viewing Server Stats">
<td><i class="fa fa-eye"></i></td>
<td class="text-left epic-text epic-text-filter"><%- lang['Viewing Server Stats'] %></td>
<td class="text-right"><span class="info-badge badge badge-sm badge-default"><span class="chartViewerCount"><i class="fa fa-spinner fa-pulse"></i></span></td>
</tr>
</table>
</div>
<div class="card-footer" style="min-height:auto">