GUI v.01

-

basicswap/ui/page_automation.py

@@ -17,10 +17,10 @@ from basicswap.db import (
     strConcepts,
 )
 
-
 def page_automation_strategies(self, url_split, post_string):
     server = self.server
     swap_client = server.swap_client
+    summary = swap_client.getSummary()
 
     filters = {
         'page_no': 1,
@@ -53,12 +53,14 @@ def page_automation_strategies(self, url_split, post_string):
         'messages': messages,
         'filters': filters,
         'strategies': formatted_strategies,
+        'summary': summary,
     })
 
 
 def page_automation_strategy_new(self, url_split, post_string):
     server = self.server
     swap_client = self.server.swap_client
+    summary = swap_client.getSummary()
 
     messages = []
     form_data = self.checkForm(post_string, 'automationstrategynew', messages)
@@ -66,6 +68,7 @@ def page_automation_strategy_new(self, url_split, post_string):
     template = server.env.get_template('automation_strategy_new.html')
     return self.render_template(template, {
         'messages': messages,
+        'summary': summary,
     })
 
 
@@ -78,6 +81,7 @@ def page_automation_strategy(self, url_split, post_string):
 
     server = self.server
     swap_client = self.server.swap_client
+    summary = swap_client.getSummary()
 
     messages = []
 
@@ -96,4 +100,5 @@ def page_automation_strategy(self, url_split, post_string):
     return self.render_template(template, {
         'messages': messages,
         'strategy': formatted_strategy,
+        'summary': summary,
     })

basicswap/ui/page_bids.py

@@ -37,6 +37,7 @@ def page_bid(self, url_split, post_string):
         raise ValueError('Bad bid ID')
     server = self.server
     swap_client = server.swap_client
+    summary = swap_client.getSummary()
 
     messages = []
     err_messages = []
@@ -113,12 +114,14 @@ def page_bid(self, url_split, post_string):
         'data': data,
         'edit_bid': edit_bid,
         'old_states': old_states,
+        'summary': summary,
     })
 
 
-def page_bids(self, url_split, post_string, sent=False, available=False):
+def page_bids(self, url_split, post_string, sent=False, available=False, received=False):
     server = self.server
     swap_client = server.swap_client
+    summary = swap_client.getSummary()
 
     filters = {
         'page_no': 1,
@@ -165,10 +168,16 @@ def page_bids(self, url_split, post_string, sent=False, available=False):
 
     template = server.env.get_template('bids.html')
     return self.render_template(template, {
-        'page_type': 'Sent' if sent else 'Received',
+        'page_type_sent': 'Sent' if sent else '',
+        'page_type_available': 'Available' if available else '',
+        'page_type_received': 'Received' if received else '',
+        'page_type_sent_description': 'Sent description' if sent else '',
+        'page_type_available_description': 'Available description' if available else '',
+        'page_type_received_description': 'Received description' if received else '',
         'messages': messages,
         'filters': filters,
         'data': page_data,
+        'summary': summary,
         'bids': [(format_timestamp(b[0]),
                  b[2].hex(), b[3].hex(), strBidState(b[5]), strTxState(b[7]), strTxState(b[8]), b[11]) for b in bids],
     })

basicswap/ui/page_offers.py

@@ -267,6 +267,7 @@ def postNewOffer(swap_client, form_data):
 def page_newoffer(self, url_split, post_string):
     server = self.server
     swap_client = server.swap_client
+    summary = swap_client.getSummary()
 
     messages = []
     err_messages = []
@@ -330,6 +331,7 @@ def page_newoffer(self, url_split, post_string):
         'addrs_to': swap_client.listSmsgAddresses('offer_send_to'),
         'data': page_data,
         'automation_strategies': automation_strategies,
+        'summary': summary,
     })
 
 
@@ -342,6 +344,7 @@ def page_offer(self, url_split, post_string):
         raise ValueError('Bad offer ID')
     server = self.server
     swap_client = server.swap_client
+    summary = swap_client.getSummary()
     offer, xmr_offer = swap_client.getXmrOffer(offer_id)
     ensure(offer, 'Unknown offer ID')
 
@@ -488,12 +491,14 @@ def page_offer(self, url_split, post_string):
         'data': data,
         'bids': formatted_bids,
         'addrs': None if show_bid_form is None else swap_client.listSmsgAddresses('bid'),
+        'summary': summary,
     })
 
 
 def page_offers(self, url_split, post_string, sent=False):
     server = self.server
     swap_client = server.swap_client
+    summary = swap_client.getSummary()
 
     filters = {
         'coin_from': -1,
@@ -552,10 +557,13 @@ def page_offers(self, url_split, post_string, sent=False):
 
     template = server.env.get_template('offers.html')
     return self.render_template(template, {
+        'page_type': 'Sent Offers' if sent else 'Network Offers',
+        'page_type_description': 'Sent Offers description' if sent else 'Network Offers description',
         'messages': messages,
         'coins_from': coins_from,
         'coins': coins_to,
         'messages': messages,
         'filters': filters,
         'offers': formatted_offers,
+        'summary': summary,
     })

basicswap/ui/page_tor.py

@@ -22,8 +22,8 @@ def get_tor_established_state(swap_client):
 
 
 def page_tor(self, url_split, post_string):
-
     swap_client = self.server.swap_client
+    summary = swap_client.getSummary()
 
     page_data = {}
 
@@ -50,4 +50,5 @@ def page_tor(self, url_split, post_string):
     return self.render_template(template, {
         'messages': messages,
         'data': page_data,
+        'summary': summary,
     })

basicswap/ui/page_wallet.py

@@ -61,6 +61,7 @@ def format_wallet_data(ci, w):
 def page_wallets(self, url_split, post_string):
     server = self.server
     swap_client = server.swap_client
+    summary = swap_client.getSummary()
 
     page_data = {}
     messages = []
@@ -153,6 +154,7 @@ def page_wallets(self, url_split, post_string):
     return self.render_template(template, {
         'messages': messages,
         'wallets': wallets_formatted,
+        'summary': summary,
     })
 
 
@@ -161,6 +163,7 @@ def page_wallet(self, url_split, post_string):
     wallet_ticker = url_split[2]
     server = self.server
     swap_client = server.swap_client
+    summary = swap_client.getSummary()
 
     coin_id = getCoinIdFromTicker(wallet_ticker)
 
@@ -240,7 +243,6 @@ def page_wallet(self, url_split, post_string):
                     swap_client.log.error(traceback.format_exc())
 
     swap_client.updateWalletsInfo(only_coin=coin_id, wait_for_complete=True)
-
     wallets = swap_client.getCachedWalletsInfo({'coin_id': coin_id})
     for k in wallets.keys():
         w = wallets[k]
@@ -304,4 +306,5 @@ def page_wallet(self, url_split, post_string):
     return self.render_template(template, {
         'messages': messages,
         'w': wallet_data,
+        'summary': summary,
     })