diff --git a/FireWalletBrowser.bsdesign b/FireWalletBrowser.bsdesign index d89b3ef..fd14601 100644 Binary files a/FireWalletBrowser.bsdesign and b/FireWalletBrowser.bsdesign differ diff --git a/main.py b/main.py index dc456af..637a753 100644 --- a/main.py +++ b/main.py @@ -1509,6 +1509,30 @@ def api_hsd(function): return jsonify({"error": "Invalid function", "result": "Invalid function"}), 400 + +@app.route('/api/v1/hsd//mobile', methods=["GET"]) +def api_hsd_mobile(function): + # Check if the user is logged in + if request.cookies.get("account") is None: + return jsonify({"error": "Not logged in"}) + + account = account_module.check_account(request.cookies.get("account")) + if not account: + return jsonify({"error": "Invalid account"}) + + if function == "sync": + sync = account_module.getNodeSync() + if sync == 100: + # Don't show sync percentage on mobile + sync = "" + elif sync == -1: + sync = "HSD Error" + else: + sync = f"{sync}%" + return jsonify({"result": sync}) + + return jsonify({"error": "Invalid function", "result": "Invalid mobile function"}), 400 + @app.route('/api/v1/wallet/', methods=["GET"]) def api_wallet(function): # Check if the user is logged in @@ -1614,6 +1638,30 @@ def api_wallet(function): return send_file('templates/assets/img/HNS.png') return jsonify({"error": "Invalid function", "result": "Invalid function"}), 400 + +@app.route('/api/v1/wallet//mobile', methods=["GET"]) +def api_wallet_mobile(function): + # Check if the user is logged in + if request.cookies.get("account") is None: + return jsonify({"error": "Not logged in"}) + + account = account_module.check_account(request.cookies.get("account")) + password = request.cookies.get("account").split(":")[1] + if not account: + return jsonify({"error": "Invalid account"}) + + if function == "sync": + sync = account_module.getWalletStatus() + if sync == "Ready": + # Don't show sync percentage on mobile + sync = "" + elif sync == "Error wallet ahead of node": + sync = "HSW Sync Error" + else: + sync = "HSW Syncing" + return jsonify({"result": sync}) + + return jsonify({"error": "Invalid function", "result": "Invalid mobile function"}), 400 @app.route('/api/v1/icon/') def api_icon(account): diff --git a/templates/404.html b/templates/404.html index fd958bf..6083fd3 100644 --- a/templates/404.html +++ b/templates/404.html @@ -43,7 +43,7 @@
-
Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
  • diff --git a/templates/assets/js/script.min.js b/templates/assets/js/script.min.js index 194e6ee..da22afd 100644 --- a/templates/assets/js/script.min.js +++ b/templates/assets/js/script.min.js @@ -1 +1 @@ -async function request(e){try{const t=await fetch(`/api/v1/${e}`);if(!t.ok)throw new Error(`HTTP error! Status: ${t.status}`);const n=await t.json();return void 0!==n.error?`Error: ${n.error}`:n.result}catch(e){return console.error("Request failed:",e),"Error"}}function sortTable(e,t=!1){const n=document.getElementById("data-table"),a=n.querySelector("tbody"),l=Array.from(a.querySelectorAll("tr")),r=n.querySelectorAll("th");let o=n.getAttribute("data-sort-order")||"asc",i=n.getAttribute("data-sort-column")||"-1";o=t||i!=e?"asc":"asc"===o?"desc":"asc",n.setAttribute("data-sort-order",o),n.setAttribute("data-sort-column",e);const d=determineColumnDataType(l,e);l.sort(((t,n)=>{let a=t.cells[e].innerText.trim(),l=n.cells[e].innerText.trim();if("number"===d){let e=parseFloat(a.replace(/[^0-9.,]/g,"").replace(/,/g,"")),t=parseFloat(l.replace(/[^0-9.,]/g,"").replace(/,/g,""));return"asc"===o?e-t:t-e}if("date"===d){let e=new Date(a),t=new Date(l);return"asc"===o?e-t:t-e}return"asc"===o?a.localeCompare(l,void 0,{sensitivity:"base"}):l.localeCompare(a,void 0,{sensitivity:"base"})})),a.innerHTML="",l.forEach((e=>a.appendChild(e))),updateSortIndicators(r,e,o)}function determineColumnDataType(e,t){const n=Math.min(5,e.length);let a=0,l=0;for(let r=0;r=e.length);r++){const n=e[r].cells[t].innerText.trim(),o=n.replace(/,/g,"").replace(/[^0-9.\-]+$/g,""),i=parseFloat(o);if(!isNaN(i)){a++;continue}const d=new Date(n);isNaN(d)||"Invalid Date"===d.toString()||l++}return a>=n/2?"number":l>=n/2?"date":"text"}function updateSortIndicators(e,t,n){e.forEach(((e,a)=>{let l=e.querySelector(".sort-indicator");l.innerHTML=a===t?"asc"===n?" ▲":" ▼":""}))}window.addEventListener("load",(async()=>{const e=["wallet-available","wallet-total","wallet-locked"],t=["wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"],n=["hsd-sync","hsd-version","hsd-height","wallet-sync","wallet-available","wallet-total","wallet-locked","wallet-pending","wallet-domainCount","wallet-bidCount","wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"].filter((e=>document.getElementById(e)));if(0!==n.length)for(const a of n){const n=document.getElementById(a),l=a.replace(/-/g,"/");let r=await request(l);t.includes(a)&&"Error"!=r&&(r=r.length),e.includes(a)&&(r=Number(r).toFixed(2)),r=r.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),n.innerHTML=r}})),document.addEventListener("DOMContentLoaded",(function(){const e=document.querySelector("#data-table tbody");e&&fetch("/api/v1/wallet/domains").then((e=>e.json())).then((t=>{e.innerHTML="",t.result.forEach((t=>{const n=document.createElement("tr"),a=document.createElement("td");a.textContent=t.nameRender,n.appendChild(a);var l="Unknown";"stats"in t&&"daysUntilExpire"in t.stats&&(l=t.stats.daysUntilExpire);const r=document.createElement("td");r.textContent=`${l} days`,n.appendChild(r);const o=document.createElement("td");o.textContent=`${(t.value/1e6).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g,",")} HNS`,n.appendChild(o);const i=document.createElement("td");i.innerHTML=t.registered?"Manage":"Register",n.appendChild(i),e.appendChild(n)})),sortTable(0,!0)})).catch((e=>console.error("Error fetching data:",e)))})),setInterval((async function(){const e=["hsd-sync","hsd-height","wallet-sync","wallet-pending","wallet-available","wallet-total"].filter((e=>document.getElementById(e)));if(0!==e.length)for(const t of e){const e=document.getElementById(t),n=t.replace(/-/g,"/");let a=await request(n);["wallet-available","wallet-total"].includes(t)&&(a=Number(a).toFixed(2)),a=a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=a}}),2e4),function(){"use strict";var e=document.querySelector(".sidebar"),t=document.querySelectorAll("#sidebarToggle, #sidebarToggleTop");if(e){e.querySelector(".collapse");var n=[].slice.call(document.querySelectorAll(".sidebar .collapse")).map((function(e){return new bootstrap.Collapse(e,{toggle:!1})}));for(var a of t)a.addEventListener("click",(function(t){if(document.body.classList.toggle("sidebar-toggled"),e.classList.toggle("toggled"),e.classList.contains("toggled"))for(var a of n)a.hide()}));window.addEventListener("resize",(function(){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)<768)for(var e of n)e.hide()}))}var l=document.querySelector("body.fixed-nav .sidebar");l&&l.on("mousewheel DOMMouseScroll wheel",(function(e){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)>768){var t=e.originalEvent,n=t.wheelDelta||-t.detail;this.scrollTop+=30*(n<0?1:-1),e.preventDefault()}}));var r=document.querySelector(".scroll-to-top");r&&window.addEventListener("scroll",(function(){var e=window.pageYOffset;r.style.display=e>100?"block":"none"}))}(); \ No newline at end of file +async function request(e){try{const t=await fetch(`/api/v1/${e}`);if(!t.ok)throw new Error(`HTTP error! Status: ${t.status}`);const n=await t.json();return void 0!==n.error?`Error: ${n.error}`:n.result}catch(e){return console.error("Request failed:",e),"Error"}}function sortTable(e,t=!1){const n=document.getElementById("data-table"),a=n.querySelector("tbody"),l=Array.from(a.querySelectorAll("tr")),r=n.querySelectorAll("th");let o=n.getAttribute("data-sort-order")||"asc",i=n.getAttribute("data-sort-column")||"-1";o=t||i!=e?"asc":"asc"===o?"desc":"asc",n.setAttribute("data-sort-order",o),n.setAttribute("data-sort-column",e);const d=determineColumnDataType(l,e);l.sort(((t,n)=>{let a=t.cells[e].innerText.trim(),l=n.cells[e].innerText.trim();if("number"===d){let e=parseFloat(a.replace(/[^0-9.,]/g,"").replace(/,/g,"")),t=parseFloat(l.replace(/[^0-9.,]/g,"").replace(/,/g,""));return"asc"===o?e-t:t-e}if("date"===d){let e=new Date(a),t=new Date(l);return"asc"===o?e-t:t-e}return"asc"===o?a.localeCompare(l,void 0,{sensitivity:"base"}):l.localeCompare(a,void 0,{sensitivity:"base"})})),a.innerHTML="",l.forEach((e=>a.appendChild(e))),updateSortIndicators(r,e,o)}function determineColumnDataType(e,t){const n=Math.min(5,e.length);let a=0,l=0;for(let r=0;r=e.length);r++){const n=e[r].cells[t].innerText.trim(),o=n.replace(/,/g,"").replace(/[^0-9.\-]+$/g,""),i=parseFloat(o);if(!isNaN(i)){a++;continue}const d=new Date(n);isNaN(d)||"Invalid Date"===d.toString()||l++}return a>=n/2?"number":l>=n/2?"date":"text"}function updateSortIndicators(e,t,n){e.forEach(((e,a)=>{let l=e.querySelector(".sort-indicator");l.innerHTML=a===t?"asc"===n?" ▲":" ▼":""}))}window.addEventListener("load",(async()=>{const e=["wallet-available","wallet-total","wallet-locked"],t=["wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"],n=["hsd-sync","hsd-version","hsd-height","wallet-sync","wallet-available","wallet-total","wallet-locked","wallet-pending","wallet-domainCount","wallet-bidCount","wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem","hsd-sync-mobile","wallet-sync-mobile"].filter((e=>document.getElementById(e)));if(0!==n.length)for(const a of n){const n=document.getElementById(a),l=a.replace(/-/g,"/");let r=await request(l);t.includes(a)&&"Error"!=r&&(r=r.length),e.includes(a)&&(r=Number(r).toFixed(2)),r=r.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),n.innerHTML=r}})),document.addEventListener("DOMContentLoaded",(function(){const e=document.querySelector("#data-table tbody");e&&fetch("/api/v1/wallet/domains").then((e=>e.json())).then((t=>{e.innerHTML="",t.result.forEach((t=>{const n=document.createElement("tr"),a=document.createElement("td");a.textContent=t.nameRender,n.appendChild(a);var l="Unknown";"stats"in t&&"daysUntilExpire"in t.stats&&(l=t.stats.daysUntilExpire);const r=document.createElement("td");r.textContent=`${l} days`,n.appendChild(r);const o=document.createElement("td");o.textContent=`${(t.value/1e6).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g,",")} HNS`,n.appendChild(o);const i=document.createElement("td");i.innerHTML=t.registered?"Manage":"Register",n.appendChild(i),e.appendChild(n)})),sortTable(0,!0)})).catch((e=>console.error("Error fetching data:",e)))})),setInterval((async function(){const e=["hsd-sync","hsd-height","wallet-sync","wallet-pending","wallet-available","wallet-total"].filter((e=>document.getElementById(e)));if(0!==e.length)for(const t of e){const e=document.getElementById(t),n=t.replace(/-/g,"/");let a=await request(n);["wallet-available","wallet-total"].includes(t)&&(a=Number(a).toFixed(2)),a=a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=a}}),2e4),function(){"use strict";var e=document.querySelector(".sidebar"),t=document.querySelectorAll("#sidebarToggle, #sidebarToggleTop");if(e){e.querySelector(".collapse");var n=[].slice.call(document.querySelectorAll(".sidebar .collapse")).map((function(e){return new bootstrap.Collapse(e,{toggle:!1})}));for(var a of t)a.addEventListener("click",(function(t){if(document.body.classList.toggle("sidebar-toggled"),e.classList.toggle("toggled"),e.classList.contains("toggled"))for(var a of n)a.hide()}));window.addEventListener("resize",(function(){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)<768)for(var e of n)e.hide()}))}var l=document.querySelector("body.fixed-nav .sidebar");l&&l.on("mousewheel DOMMouseScroll wheel",(function(e){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)>768){var t=e.originalEvent,n=t.wheelDelta||-t.detail;this.scrollTop+=30*(n<0?1:-1),e.preventDefault()}}));var r=document.querySelector(".scroll-to-top");r&&window.addEventListener("scroll",(function(){var e=window.pageYOffset;r.style.display=e>100?"block":"none"}))}(); \ No newline at end of file diff --git a/templates/auction.html b/templates/auction.html index 17f2639..bb41036 100644 --- a/templates/auction.html +++ b/templates/auction.html @@ -43,7 +43,7 @@
    -
    Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
    • diff --git a/templates/auctions.html b/templates/auctions.html index b57d4df..99b1840 100644 --- a/templates/auctions.html +++ b/templates/auctions.html @@ -43,7 +43,7 @@
      -
      Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
      • diff --git a/templates/confirm-password.html b/templates/confirm-password.html index e0eb739..1118a1e 100644 --- a/templates/confirm-password.html +++ b/templates/confirm-password.html @@ -43,7 +43,7 @@
        -
        Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
        • diff --git a/templates/confirm.html b/templates/confirm.html index a3a6ad9..3e9e2bf 100644 --- a/templates/confirm.html +++ b/templates/confirm.html @@ -43,7 +43,7 @@
          -
          Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
          • diff --git a/templates/index.html b/templates/index.html index 9045e27..f0f6b79 100644 --- a/templates/index.html +++ b/templates/index.html @@ -43,7 +43,7 @@
            -
            Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
            • diff --git a/templates/manage.html b/templates/manage.html index 91ccd97..17d0031 100644 --- a/templates/manage.html +++ b/templates/manage.html @@ -43,7 +43,7 @@
              -
              Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
              • diff --git a/templates/message.html b/templates/message.html index 3c1abad..223a44b 100644 --- a/templates/message.html +++ b/templates/message.html @@ -43,7 +43,7 @@
                -
                Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                • diff --git a/templates/plugin-output.html b/templates/plugin-output.html index 599cc00..473b95e 100644 --- a/templates/plugin-output.html +++ b/templates/plugin-output.html @@ -43,7 +43,7 @@
                  -
                  Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                  • diff --git a/templates/plugin.html b/templates/plugin.html index 9b75914..da2464d 100644 --- a/templates/plugin.html +++ b/templates/plugin.html @@ -43,7 +43,7 @@
                    -
                    Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                    • diff --git a/templates/plugins.html b/templates/plugins.html index 63ad0a0..5d9a343 100644 --- a/templates/plugins.html +++ b/templates/plugins.html @@ -43,7 +43,7 @@
                      -
                      Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                      • diff --git a/templates/receive.html b/templates/receive.html index 49c1f61..73be56c 100644 --- a/templates/receive.html +++ b/templates/receive.html @@ -43,7 +43,7 @@
                        -
                        Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                        • diff --git a/templates/search.html b/templates/search.html index 69cf5e6..075f73f 100644 --- a/templates/search.html +++ b/templates/search.html @@ -43,7 +43,7 @@
                          -
                          Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                          • diff --git a/templates/send.html b/templates/send.html index 0cc17d7..12494f6 100644 --- a/templates/send.html +++ b/templates/send.html @@ -43,7 +43,7 @@
                            -
                            Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                            • diff --git a/templates/settings.html b/templates/settings.html index c477ffb..c3499bd 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -44,7 +44,7 @@
                              -
                              Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                              • diff --git a/templates/success.html b/templates/success.html index 5ed9f70..27542b4 100644 --- a/templates/success.html +++ b/templates/success.html @@ -43,7 +43,7 @@
                                -
                                Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}
                                • diff --git a/templates/tx.html b/templates/tx.html index f719967..c1f4d92 100644 --- a/templates/tx.html +++ b/templates/tx.html @@ -43,7 +43,7 @@
                                  -
                                  Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}} + {{sync}}{{wallet_status}}Sync: {{sync}}%Wallet: {{wallet_status}}Height: {{height}}