Reshuffle the menu to minimise confusion

core/exchanges/alpaca.py

@@ -22,9 +22,16 @@ class AlpacaExchange(BaseExchange):
     def get_account(self):
         return self.call("get_account")
 
-    def get_supported_assets(self):
+    def get_instruments(self):
         request = GetAssetsRequest(status="active", asset_class="crypto")
         assets = self.call("get_all_assets", filter=request)
+        return assets
+
+    def get_currencies(self, currencies):
+        pass  # TODO
+
+    def get_supported_assets(self):
+        assets = self.get_instruments()
         assets = assets["itemlist"]
         asset_list = [x["symbol"] for x in assets if "symbol" in x]
 
@@ -67,7 +74,7 @@ class AlpacaExchange(BaseExchange):
         cast = {
             "symbol": trade.symbol,
             "side": direction,
-            "time_in_force": TimeInForce.IOC,
+            "time_in_force": TimeInForce.IOC,  # TODO
         }
         if trade.amount is not None:
             cast["qty"] = trade.amount
@@ -115,7 +122,7 @@ class AlpacaExchange(BaseExchange):
         return order
 
     def get_trade(self, trade_id):
-        pass
+        pass  # TODO
 
     def update_trade(self, trade):
         pass
@@ -125,7 +132,7 @@ class AlpacaExchange(BaseExchange):
 
     def get_position_info(self, symbol):
         position = self.call("get_open_position", symbol)
-        return position
+        return position  # TODO: check
 
     def get_all_positions(self):
         items = []
@@ -139,7 +146,7 @@ class AlpacaExchange(BaseExchange):
         return items
 
     def close_position(self, side, symbol):
-        pass
+        pass  # TODO
 
     def close_all_positions(self):
-        pass
+        pass  # TODO

core/templates/base.html

@@ -219,25 +219,20 @@
 
             <div class="navbar-item has-dropdown is-hoverable">
               <a class="navbar-link">
-                View
+                Exchange
               </a>
               <div class="navbar-dropdown">
                 <a class="navbar-item" href="{% url 'profit' type='page' %}">
-                  Profit by account
+                  Profit
                 </a>
-              </div>
-            </div>
-
-            <div class="navbar-item has-dropdown is-hoverable">
-              <a class="navbar-link">
-                Manage
-              </a>
-              <div class="navbar-dropdown">
                 <a class="navbar-item" href="{% url 'positions' type='page' %}">
                   Positions
                 </a>
                 <a class="navbar-item" href="{% url 'trades' type='page' %}">
-                  Bot Trades
+                  Trades
+                </a>
+                <a class="navbar-item" href="{% url 'accounts' type='page' %}">
+                  Accounts
                 </a>
               </div>
             </div>
@@ -245,28 +240,17 @@
               <a class="navbar-link">
                 Setup
               </a>
-
               <div class="navbar-dropdown">
-                <a class="navbar-item" href="{% url 'hooks' type='page' %}">
-                  Hooks
+                <a class="navbar-item" href="{% url 'strategies' type='page' %}">
+                  Strategies
                 </a>
                 <a class="navbar-item" href="{% url 'signals' type='page' %}">
                   Signals
                 </a>
-                <a class="navbar-item" href="{% url 'accounts' type='page' %}">
-                  Accounts
+                <a class="navbar-item" href="{% url 'hooks' type='page' %}">
+                  Hooks
                 </a>
-                <a class="navbar-item" href="{% url 'strategies' type='page' %}">
-                  Strategies
-                </a>
-              </div>
-            </div>
-            <div class="navbar-item has-dropdown is-hoverable">
-              <a class="navbar-link">
-                Limits
-              </a>
 
-              <div class="navbar-dropdown">
                 <a class="navbar-item" href="{% url 'tradingtimes' type='page' %}">
                   Trading Times
                 </a>