feat: Sort bids by block to make it more intuitive
All checks were successful
Build Docker / Build Image (push) Successful in 42s
All checks were successful
Build Docker / Build Image (push) Successful in 42s
This commit is contained in:
parent
2b895a524a
commit
35d3ccd0c0
15
main.py
15
main.py
@ -291,7 +291,7 @@ def auctions():
|
|||||||
# Sort
|
# Sort
|
||||||
sort = request.args.get("sort")
|
sort = request.args.get("sort")
|
||||||
if sort == None:
|
if sort == None:
|
||||||
sort = "state"
|
sort = "time"
|
||||||
sort = sort.lower()
|
sort = sort.lower()
|
||||||
sort_price = ""
|
sort_price = ""
|
||||||
sort_price_next = "⬇"
|
sort_price_next = "⬇"
|
||||||
@ -299,11 +299,13 @@ def auctions():
|
|||||||
sort_state_next = "⬇"
|
sort_state_next = "⬇"
|
||||||
sort_domain = ""
|
sort_domain = ""
|
||||||
sort_domain_next = "⬇"
|
sort_domain_next = "⬇"
|
||||||
|
sort_time = ""
|
||||||
|
sort_time_next = "⬇"
|
||||||
reverse = False
|
reverse = False
|
||||||
|
|
||||||
direction = request.args.get("direction")
|
direction = request.args.get("direction")
|
||||||
if direction == None:
|
if direction == None:
|
||||||
if sort == "state":
|
if sort == "time":
|
||||||
direction = "⬆"
|
direction = "⬆"
|
||||||
else:
|
else:
|
||||||
direction = "⬇"
|
direction = "⬇"
|
||||||
@ -320,6 +322,10 @@ def auctions():
|
|||||||
sort_state = direction
|
sort_state = direction
|
||||||
sort_state_next = reverseDirection(direction)
|
sort_state_next = reverseDirection(direction)
|
||||||
domains = sorted(domains, key=lambda k: k['state'],reverse=reverse)
|
domains = sorted(domains, key=lambda k: k['state'],reverse=reverse)
|
||||||
|
elif sort == "time":
|
||||||
|
sort_time = direction
|
||||||
|
sort_time_next = reverseDirection(direction)
|
||||||
|
bids = sorted(bids, key=lambda k: k['height'],reverse=reverse)
|
||||||
else:
|
else:
|
||||||
# Sort by domain
|
# Sort by domain
|
||||||
bids = sorted(bids, key=lambda k: k['name'],reverse=reverse)
|
bids = sorted(bids, key=lambda k: k['name'],reverse=reverse)
|
||||||
@ -358,7 +364,8 @@ def auctions():
|
|||||||
sort_price=sort_price,sort_state=sort_state,
|
sort_price=sort_price,sort_state=sort_state,
|
||||||
sort_domain=sort_domain,sort_price_next=sort_price_next,
|
sort_domain=sort_domain,sort_price_next=sort_price_next,
|
||||||
sort_state_next=sort_state_next,sort_domain_next=sort_domain_next,
|
sort_state_next=sort_state_next,sort_domain_next=sort_domain_next,
|
||||||
bids=len(bids),reveal=pending_reveals,message=message)
|
bids=len(bids),reveal=pending_reveals,message=message,
|
||||||
|
sort_time=sort_time,sort_time_next=sort_time_next)
|
||||||
|
|
||||||
@app.route('/reveal')
|
@app.route('/reveal')
|
||||||
def revealAllBids():
|
def revealAllBids():
|
||||||
@ -1092,7 +1099,7 @@ def settings_action(action):
|
|||||||
resp = account_module.rescan()
|
resp = account_module.rescan()
|
||||||
if 'error' in resp:
|
if 'error' in resp:
|
||||||
return redirect("/settings?error=" + str(resp['error']))
|
return redirect("/settings?error=" + str(resp['error']))
|
||||||
return redirect("/settings?success=Resent transactions")
|
return redirect("/settings?success=Rescan started")
|
||||||
elif action == "resend":
|
elif action == "resend":
|
||||||
resp = account_module.resendTXs()
|
resp = account_module.resendTXs()
|
||||||
if 'error' in resp:
|
if 'error' in resp:
|
||||||
|
@ -199,6 +199,7 @@ def bidDomains(bids,domains, sortState=False):
|
|||||||
html += f"<td>{domain['name']}</td>"
|
html += f"<td>{domain['name']}</td>"
|
||||||
html += f"<td>{domain['state']}</td>"
|
html += f"<td>{domain['state']}</td>"
|
||||||
html += f"<td>{bidDisplay}</td>"
|
html += f"<td>{bidDisplay}</td>"
|
||||||
|
html += f"<td>{bid['height']}</td>"
|
||||||
html += "</tr>"
|
html += "</tr>"
|
||||||
else:
|
else:
|
||||||
for domain in domains:
|
for domain in domains:
|
||||||
|
@ -125,6 +125,7 @@
|
|||||||
<th><a href="/auctions?direction={{sort_domain_next}}">Domain{{sort_domain}}</a></th>
|
<th><a href="/auctions?direction={{sort_domain_next}}">Domain{{sort_domain}}</a></th>
|
||||||
<th><a href="/auctions?sort=state&direction={{sort_state_next}}">State{{sort_state}}</a></th>
|
<th><a href="/auctions?sort=state&direction={{sort_state_next}}">State{{sort_state}}</a></th>
|
||||||
<th><a href="/auctions?sort=price&direction={{sort_price_next}}">Bid{{sort_price}}</a></th>
|
<th><a href="/auctions?sort=price&direction={{sort_price_next}}">Bid{{sort_price}}</a></th>
|
||||||
|
<th><a href="/auctions?sort=time&direction={{sort_time_next}}">Block{{sort_time}}</a></th>
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
Loading…
Reference in New Issue
Block a user