Browse Source
Merge pull request #143 from Samourai-Wallet/feat_dojo_versionning
improve display of dojo version
use-env-var-docker
kenshin samourai
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
15 additions and
2 deletions
-
docker/my-dojo/node/keys.index.js
-
keys/index-example.js
-
static/admin/tool/index.html
-
static/admin/tool/index.js
|
|
@ -18,7 +18,7 @@ module.exports = { |
|
|
|
/* |
|
|
|
* Dojo version |
|
|
|
*/ |
|
|
|
dojoVersion: process.env.DOJO_VERSION_TAG, |
|
|
|
dojoVersion: process.env.DOJO_NODEJS_VERSION_TAG, |
|
|
|
/* |
|
|
|
* Bitcoind |
|
|
|
*/ |
|
|
|
|
|
@ -216,6 +216,7 @@ module.exports = { |
|
|
|
* Testnet parameters |
|
|
|
*/ |
|
|
|
testnet: { |
|
|
|
dojoVersion: '1.5.0', |
|
|
|
bitcoind: { |
|
|
|
rpc: { |
|
|
|
user: 'user', |
|
|
|
|
|
@ -22,7 +22,7 @@ |
|
|
|
<!-- HEADER --> |
|
|
|
<div id="header" class="row"> |
|
|
|
<div class="col-xs-9"> |
|
|
|
<h1 class="title"><span>DOJO // MAINTENANCE TOOL</span> <span class="beta">beta</span></h1> |
|
|
|
<h1 class="title"><span>DOJO // MAINTENANCE TOOL</span> <span id="dojo-version" class="beta">beta</span></h1> |
|
|
|
</div> |
|
|
|
<div class="col-xs-3 login-box"> |
|
|
|
<a id="btn-logout" style="display: inline;" href="#" title="DISCONNECT"> |
|
|
|
|
|
@ -84,6 +84,18 @@ function initTabs() { |
|
|
|
function preparePage() { |
|
|
|
const activeTab = sessionStorage.getItem('activeTab'); |
|
|
|
|
|
|
|
// Dojo version
|
|
|
|
let lblVersion = sessionStorage.getItem('lblVersion'); |
|
|
|
if (lblVersion == null) { |
|
|
|
lib_api.getPairingInfo().then(apiInfo => { |
|
|
|
lblVersion = 'v' + apiInfo['pairing']['version'] + ' beta'; |
|
|
|
sessionStorage.setItem('lblVersion', lblVersion); |
|
|
|
$('#dojo-version').text(lblVersion); |
|
|
|
}); |
|
|
|
} else { |
|
|
|
$('#dojo-version').text(lblVersion); |
|
|
|
} |
|
|
|
|
|
|
|
// Pairing
|
|
|
|
if (activeTab == '#link-pairing') { |
|
|
|
$('#screen-pairing').show(); |
|
|
|