heierbtc/mynode
1
0
Fork 1
mirror of https://github.com/mynodebtc/mynode.git synced 2024-12-28 15:31:37 +00:00
Code Issues Projects Releases Wiki Activity

Jam updates

Browse Source
This commit is contained in:
Taylor Helsper 2022-10-16 21:09:41 -05:00
parent c9119f9f36
commit 57f198cddf
5 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rootfs/standard/usr/share/mynode_apps/jam/jam.json
View File

@ -50,9 +50,9 @@
{
"heading": "Instructions",
"content": [
"JoinMarket is a mixing wallet for Bitcoin that can be used with a web interface via JAM.",
"To get started, you just need to install and enable JAM via the myNode Marketplace.",
"Once installed, click the Open JAM link above or the link on the JAM application page.",
"JoinMarket is a mixing wallet for Bitcoin that can be used with a web interface via Jam.",
"First, for the application to run properly, JoinMarket also needs be installed via the myNode Marketplace.",
"To get started, you just need enable Jam and click the open button on the left. Then, follow the instructions within the app!",
"Enjoy mixing your coins!"
]
}

9
rootfs/standard/var/pynode/application_info.py
View File

@ -362,6 +362,8 @@ def get_application_log(short_name):
return get_journalctl_log("usb_extras")
elif short_name == "www":
return get_journalctl_log("www")
elif short_name == "i2pd":
return get_file_log("/var/log/i2pd/i2pd.log")
elif short_name == "linux":
return run_linux_cmd("dmesg | tac | head -n 200")
else:
@ -398,6 +400,10 @@ def get_application_status_special(short_name):
return "Syncing..."
elif tracker_status == TrackerStatus.ERROR:
return "Tracker Error"
elif short_name == "jam":
if not is_installed("joininbox"):
return "Requires JoinMarket"
return ""
def get_application_status(short_name):
@ -452,6 +458,9 @@ def get_application_status_color_special(short_name):
return "red"
else:
return "gray"
elif short_name == "jam":
if not is_installed("joininbox"):
return "yellow"
return ""
def get_application_status_color(short_name):

3
rootfs/standard/var/www/mynode/settings.py
View File

@ -290,6 +290,9 @@ def page_status():
#"www_status_log": get_journalctl_log("www"),
"www_status": get_service_status_basic_text("www"),
"www_status_color": get_service_status_color("www"),
#"i2pd_status_log": get_journalctl_log("i2pd"),
"i2pd_status": get_service_status_basic_text("i2pd"),
"i2pd_status_color": get_service_status_color("i2pd"),
#"ufw_status_log": get_journalctl_log("ufw"),
"ufw_status": get_service_status_basic_text("ufw"),
"ufw_status_color": get_service_status_color("ufw"),

12
rootfs/standard/var/www/mynode/templates/joinmarket.html
View File

@ -30,7 +30,7 @@
{% if not is_jam_installed or not is_jam_enabled %}
disabled="disabled" title="JAM must be installed and running"
{% endif %}
>Open JAM</button>
>Open Jam</button>
<button class="ui-button ui-widget ui-corner-all mynode_button_small" onclick="open_app_in_new_tab('{{ob_http_port}}', '{{ob_https_port}}', false, '{{ob_tor_address}}')">Open Orderbook</button>
</div>
</div>
@ -65,18 +65,18 @@
{% endif %}
<div class="instructions">
<div class="instructions-header">Instructions to use JoininBox</div>
<div class="instructions-header">Instructions to use Jam</div>
<ol class="instructions-steps">
<li>JoinMarket is a mixing wallet for Bitcoin that can be used with a web interface via JAM.</li>
<li>To get started, you just need to install and enable JAM via the myNode Marketplace.</li>
<li>Once installed, click the Open JAM link above or the link on the JAM application page.</li>
<li>JoinMarket is a mixing wallet for Bitcoin that can be used with a web interface via Jam.</li>
<li>To get started, you just need to install and enable Jam via the myNode Marketplace.</li>
<li>Once installed, click the Open Jam link above or the link on the Jam application page.</li>
<li>Enjoy mixing your coins!</li>
</ol>
</div>
<div class="instructions">
<div class="instructions-header">Instructions to use JAM</div>
<div class="instructions-header">Instructions to use JoininBox</div>
<ol class="instructions-steps">
<li>JoinMarket is a mixing wallet for Bitcoin that can be used with a terminal interface via JoininBox.</li>
<li>To get started, you need access to the Linux terminal of your myNode device.</li>

9
rootfs/standard/var/www/mynode/templates/status.html
View File

@ -337,6 +337,15 @@
<div id="www_log" style='text-align: left; font-size: 12px; width: 800px; display: none;'><pre>{{www_status_log}}</pre></div>
<div class="divider"></div>
<div class="settings_block_subheader">I2PD Status</div>
<div class="settings_block_subheader_status">
<div class="settings_block_subheader_status_icon {{ i2pd_status_color }}"></div>
{{ i2pd_status }}
</div>
<button id="show_i2pd_log" onclick="showLog('i2pd')" class="ui-button ui-widget ui-corner-all settings_button_small">Show Log</button>
<div id="i2pd_log" style='text-align: left; font-size: 12px; width: 800px; display: none;'><pre>{{i2pd_status_log}}</pre></div>
<div class="divider"></div>
<div class="settings_block_subheader">Firewall Status</div>
<div class="settings_block_subheader_status">
<div class="settings_block_subheader_status_icon {{ ufw_status_color }}"></div>