From d12a7db52ab128b7926e3cdcafa8f0d63b280f91 Mon Sep 17 00:00:00 2001 From: gagarin55 Date: Wed, 13 Apr 2016 14:25:00 -0700 Subject: [PATCH 1/2] minor refinements --- .gitignore | 1 + README.md | 2 +- index.html | 1 - js/functions.js | 12 +++--------- nbproject/project.properties | 3 +++ nbproject/project.xml | 9 +++++++++ 6 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 .gitignore create mode 100644 nbproject/project.properties create mode 100644 nbproject/project.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..14bc68c7cc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/nbproject/private/ \ No newline at end of file diff --git a/README.md b/README.md index 9c3470d649..8561f72a3d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ WavesUI Lite. This is the concept of the Waves Lite Client. The current implementation is on top of Scorex Permacoin implementation as on https://github.com/ScorexProject/Scorex -Scorex will be used to implement Waves Blocchain Consensus and Protocol. +Scorex will be used to implement Waves Blockchain Consensus and Protocol. # Testing diff --git a/index.html b/index.html index 956f473162..1b6cf6e228 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,4 @@ - Waves - Demo diff --git a/js/functions.js b/js/functions.js index 12e6ac96ff..3c2b56ed05 100644 --- a/js/functions.js +++ b/js/functions.js @@ -267,7 +267,7 @@ function loadConsensus() { appContainer += 'KeyValue'; appContainer += ''; - $.getJSON('http://23.94.190.226:9081/consensus/target', function (response_target) { + $.getJSON(server+'/consensus/target', function (response_target) { $.each(response_target, function(key, value) { @@ -292,10 +292,7 @@ function loadConsensus() { }); - }); - - }); @@ -319,7 +316,6 @@ function loadPayment () { - $("#app").html(paymentForm); @@ -336,7 +332,7 @@ function loadDebug () { debugPage += 'KeyValue'; debugPage += ''; - $.getJSON('http://23.94.190.226:9081/debug/settings', function (response) { + $.getJSON(server+'/debug/settings', function (response) { $.each(response, function(key, value) { @@ -353,7 +349,7 @@ function loadDebug () { debugPage += '

Info

'; - $.getJSON('http://23.94.190.226:9081/debug/info', function (response_info) { + $.getJSON(server+'/debug/info', function (response_info) { $.each(response_info, function(key, value) { @@ -375,6 +371,4 @@ function loadDebug () { }); }); - - } \ No newline at end of file diff --git a/nbproject/project.properties b/nbproject/project.properties new file mode 100644 index 0000000000..4ba3d5812d --- /dev/null +++ b/nbproject/project.properties @@ -0,0 +1,3 @@ +file.reference.waves-WavesGUI=. +files.encoding=UTF-8 +source.folder=${file.reference.waves-WavesGUI} diff --git a/nbproject/project.xml b/nbproject/project.xml new file mode 100644 index 0000000000..00c1d8194e --- /dev/null +++ b/nbproject/project.xml @@ -0,0 +1,9 @@ + + + org.netbeans.modules.web.clientproject + + + WavesGUI + + + From 8552107aa81820fb649edf5f6605c6220c880b98 Mon Sep 17 00:00:00 2001 From: gagarin55 Date: Wed, 13 Apr 2016 15:25:17 -0700 Subject: [PATCH 2/2] fixed Info section on debug page --- js/functions.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index 3c2b56ed05..b907ae8db9 100644 --- a/js/functions.js +++ b/js/functions.js @@ -348,7 +348,10 @@ function loadDebug () { debugPage += ''; debugPage += '

Info

'; - + debugPage += ''; + debugPage += ''; + debugPage += ''; + $.getJSON(server+'/debug/info', function (response_info) { $.each(response_info, function(key, value) {
KeyValue