feat: Add js loading of /tx page

main.py

@@ -81,7 +81,10 @@ def transactions():
         return redirect("/login")
 
     account = account_module.check_account(request.cookies.get("account"))
-    # Get the transactions
+    if not account:
+        return redirect("/logout")
+    
+    # Get the page parameter
     page = request.args.get('page')
     try:
         page = int(page)
@@ -91,33 +94,9 @@ def transactions():
     if page < 1:
         page = 1
     
-    # Check for force refresh parameter
+    # Return the template with loading state - transactions will be loaded via AJAX
-    force_refresh = request.args.get('refresh') == 'true'
-    
-    # Create a cache key based on account and page
-    cache_key = f"{account}_{page}"
-    
-    # Check if data is in cache and not expired
-    current_time = time.time()
-    if not force_refresh and cache_key in tx_cache and (current_time - tx_cache[cache_key]['time'] < TX_CACHE_TIMEOUT):
-        transactions = tx_cache[cache_key]['data']
-        txCount = len(transactions)
-        transactions_html = tx_cache[cache_key]['html']
-    else:
-        # Fetch transactions from account module
-        transactions = account_module.getTransactions(account, page)
-        txCount = len(transactions)
-        transactions_html = render.transactions(transactions)
-        
-        # Store in cache
-        tx_cache[cache_key] = {
-            'data': transactions,
-            'html': transactions_html,
-            'time': current_time
-        }
     return render_template("tx.html", account=account, 
-                           tx=transactions_html,
+                           page=page, txCount=0)
-                           page=page, txCount=txCount)
     
 
 @app.route('/send')
@@ -1085,6 +1064,7 @@ def reveal_auction(domain):
     if request.cookies.get("account") is None:
         return redirect("/login")
 
+    
     if not account_module.check_account(request.cookies.get("account")):
         return redirect("/logout")
     
@@ -1529,6 +1509,57 @@ def api_hsd(function):
     
     return jsonify({"error": "Invalid function", "result": "Invalid function"}), 400
     
+@app.route('/api/v1/transactions', methods=["GET"])
+def api_transactions():
+    # 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"})
+    
+    # Get the page parameter
+    page = request.args.get('page')
+    try:
+        page = int(page)
+    except:
+        page = 1
+
+    if page < 1:
+        page = 1
+        
+    # Check for force refresh parameter
+    force_refresh = request.args.get('refresh') == 'true'
+    
+    # Create a cache key based on account and page
+    cache_key = f"{account}_{page}"
+    
+    # Check if data is in cache and not expired
+    current_time = time.time()
+    if not force_refresh and cache_key in tx_cache and (current_time - tx_cache[cache_key]['time'] < TX_CACHE_TIMEOUT):
+        transactions = tx_cache[cache_key]['data']
+        txCount = len(transactions)
+        transactions_html = tx_cache[cache_key]['html']
+    else:
+        # Fetch transactions from account module
+        transactions = account_module.getTransactions(account, page)
+        txCount = len(transactions)
+        transactions_html = render.transactions(transactions)
+        
+        # Store in cache
+        tx_cache[cache_key] = {
+            'data': transactions,
+            'html': transactions_html,
+            'time': current_time
+        }
+    
+    return jsonify({
+        "html": transactions_html,
+        "txCount": txCount,
+        "page": page
+    })
+
 @app.route('/api/v1/wallet/<function>', methods=["GET"])
 def api_wallet(function):
     # Check if the user is logged in

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 c=determineColumnDataType(l,e);l.sort(((t,n)=>{let a=t.cells[e].innerText.trim(),l=n.cells[e].innerText.trim();if("number"===c){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"===c){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<n&&!(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 c=new Date(n);isNaN(c)||"Invalid Date"===c.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=["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"],t=["wallet-available","wallet-total","wallet-locked"],n=["wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"];for(const a of e){const e=document.getElementById(a);if(e){const l=a.replace(/-/g,"/");let r=await request(l);n.includes(a)&&"Error"!=r&&(r=r.length),t.includes(a)&&(r=Number(r).toFixed(2)),r=r.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=r}}})),document.addEventListener("DOMContentLoaded",(function(){fetch("/api/v1/wallet/domains").then((e=>e.json())).then((e=>{const t=document.querySelector("#data-table tbody");t&&(t.innerHTML="",e.result.forEach((e=>{const n=document.createElement("tr"),a=document.createElement("td");a.textContent=e.nameRender,n.appendChild(a);var l="Unknown";"stats"in e&&"daysUntilExpire"in e.stats&&(l=e.stats.daysUntilExpire);const r=document.createElement("td");r.textContent=`${l} days`,n.appendChild(r);const o=document.createElement("td");o.textContent=`${(e.value/1e6).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g,",")} HNS`,n.appendChild(o);const i=document.createElement("td");i.innerHTML=e.registered?"<a href='/manage/"+e.name+"'>Manage</a>":"<a href='/auction/"+e.name+"/register'>Register</a>",n.appendChild(i),t.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"];for(const t of e){const e=document.getElementById(t);if(e){const 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"}))}();
+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<n&&!(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?"<a href='/manage/"+t.name+"'>Manage</a>":"<a href='/auction/"+t.name+"/register'>Register</a>",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"}))}();

templates/tx.html

@@ -71,9 +71,10 @@
     {% if page != 1 %}
     <a class="btn btn-primary" role="button" href="/tx?page={{page-1}}">Prev</a>
     {% endif %}
-    {% if txCount == 100 %}
+    <!-- {% if txCount == 100 %} -->
+     <!-- {% endif %} -->
     <a class="btn btn-primary" role="button" href="/tx?page={{page+1}}">Next</a>
-    {% endif %}
+    
 </div>
                             </div>
                         </div>
@@ -88,8 +89,17 @@
                 <th class="amount-column">Amount</th>
             </tr>
         </thead>
-        <tbody>
+        <tbody id="transactions-tbody">
-            {{tx|safe}}
+            <tr id="loading-row">
+                <td colspan="5" class="text-center">
+                    <div class="spinner-border text-primary" role="status">
+                        <span class="visually-hidden">Loading...</span>
+                    </div>
+                    <div class="mt-2">Loading transactions...</div>
+                </td>
+            </tr>
+            <!-- <tbody>
+            {{tx|safe}} -->
         </tbody>
         <tfoot>
             <tr>
@@ -101,7 +111,47 @@
             </tr>
         </tfoot>
     </table>
-</div></div>
+</div>
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        const page = {{ page }};
+    const tbody = document.getElementById('transactions-tbody');
+    const loadingRow = document.getElementById('loading-row');
+
+    // Fetch transactions
+    fetch(`/api/v1/transactions?page=${page}`)
+        .then(response => response.json())
+        .then(data => {
+            if (data.error) {
+                tbody.innerHTML = `<tr><td colspan="5" class="text-center text-danger">Error: ${data.error}</td></tr>`;
+                return;
+            }
+
+            // Replace loading with actual transactions
+            tbody.innerHTML = data.html;
+
+            // Update pagination buttons if needed
+            updatePagination(data.txCount, page);
+        })
+        .catch(error => {
+            console.error('Error fetching transactions:', error);
+            tbody.innerHTML = '<tr><td colspan="5" class="text-center text-danger">Failed to load transactions</td></tr>';
+        });
+    });
+
+    function updatePagination(txCount, currentPage) {
+        // Update pagination buttons based on transaction count
+        const prevBtn = document.querySelector('a[href*="page=' + (currentPage - 1) + '"]');
+        const nextBtn = document.querySelector('a[href*="page=' + (currentPage + 1) + '"]');
+
+        if (currentPage <= 1 && prevBtn) {
+            prevBtn.style.display = 'none';
+        }
+        if (txCount < 100 && nextBtn) {
+            nextBtn.style.display = 'none';
+        }
+    }
+</script></div>
                     </div>
                 </div>
             </div>