Spaces:

babaTEEpe
/

viewc

Running

App Files Files Community

babaTEEpe commited on Jun 2

Commit

820bca0

verified ·

1 Parent(s): d58a3ae

Update app.py

Browse files

Files changed (1) hide show

app.py +81 -42

app.py CHANGED Viewed

@@ -290,7 +290,83 @@ async def dashboard(request: Request):
             error_msg = f"Failed to connect to cTrader: {e}"
             logger.error(error_msg)
-    # Simple premium dark mode HTML Dashboard
     html_content = f"""
     <!DOCTYPE html>
     <html>
@@ -397,55 +473,18 @@ async def dashboard(request: Request):
                     <p style="margin: 5px 0 0 0; color: #64748b;">Hugging Face Cloud Server ({CTRADER_ENV} environment)</p>
                 </div>
                 <div>
-                    {f'<span class="status-badge status-connected">✓ Connected</span>' if is_authenticated else '<span class="status-badge status-disconnected">✗ Disconnected</span>'}
                 </div>
             </div>
-            {f'<div class="alert-danger">{error_msg}</div>' if error_msg else ''}
-            {!is_authenticated and f'''
-            <div class="card" style="text-align: center; padding: 40px;">
-                <h2>Authentication Required</h2>
-                <p style="color: #94a3b8; margin-bottom: 24px;">Please connect your cTrader account to authorize the bot to execute trades on your behalf.</p>
-                <a href="/login" class="btn">Authorize Bot with cTrader</a>
-            </div>
-            ''' or f'''
-            <div class="grid">
-                <div class="card">
-                    <h3>Account ID</h3>
-                    <div class="value">{account_id}</div>
-                </div>
-                <div class="card">
-                    <h3>Current Balance</h3>
-                    <div class="value">{balance}</div>
-                </div>
-            </div>
-            <div class="card" style="margin-bottom: 30px;">
-                <h3>Active Open Positions</h3>
-                {positions and f"""
-                <table>
-                    <thead>
-                        <tr>
-                            <th>Position ID</th>
-                            <th>Symbol ID</th>
-                            <th>Side</th>
-                            <th>Volume</th>
-                            <th>Entry Price</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {"".join(f"<tr><td>{p['id']}</td><td>{p['symbol_id']}</td><td style='color: {'#34d399' if p['side']=='BUY' else '#f87171'}'>{p['side']}</td><td>{p['volume']}</td><td>{p['entry_price']}</td></tr>" for p in positions)}
-                    </tbody>
-                </table>
-                """ or '<p style="color: #64748b; margin: 10px 0 0 0;">No active positions found.</p>'}
-            </div>
-            '''}
             <div class="card">
                 <h3>Webhook Signal History</h3>
                 <div class="log-feed">
-                    {WEBHOOK_LOGS and "".join(f'<div class="log-item"><span class="log-time">[{l["time"]}]</span> <span class="log-action" style="color: {l["color"]}">{l["action"]}</span> {l["msg"]}</div>' for l in reversed(WEBHOOK_LOGS)) or '<div style="color: #64748b;">Waiting for signals from TradingView...</div>'}
                 </div>
             </div>
         </div>

             error_msg = f"Failed to connect to cTrader: {e}"
             logger.error(error_msg)
+    # 1. Construct positions table HTML (avoiding nested f-strings)
+    positions_html = ""
+    if positions:
+        rows = "".join(
+            f"<tr><td>{p['id']}</td><td>{p['symbol_id']}</td>"
+            f"<td style='color: {'#34d399' if p['side']=='BUY' else '#f87171'}'>{p['side']}</td>"
+            f"<td>{p['volume']}</td><td>{p['entry_price']}</td></tr>"
+            for p in positions
+        )
+        positions_html = f"""
+        <table>
+            <thead>
+                <tr>
+                    <th>Position ID</th>
+                    <th>Symbol ID</th>
+                    <th>Side</th>
+                    <th>Volume</th>
+                    <th>Entry Price</th>
+                </tr>
+            </thead>
+            <tbody>
+                {rows}
+            </tbody>
+        </table>
+        """
+    else:
+        positions_html = '<p style="color: #64748b; margin: 10px 0 0 0;">No active positions found.</p>'
+    # 2. Construct OAuth status card HTML
+    auth_card_html = ""
+    if not is_authenticated:
+        auth_card_html = f"""
+        <div class="card" style="text-align: center; padding: 40px;">
+            <h2>Authentication Required</h2>
+            <p style="color: #94a3b8; margin-bottom: 24px;">Please connect your cTrader account to authorize the bot to execute trades on your behalf.</p>
+            <a href="/login" class="btn">Authorize Bot with cTrader</a>
+        </div>
+        """
+    else:
+        auth_card_html = f"""
+        <div class="grid">
+            <div class="card">
+                <h3>Account ID</h3>
+                <div class="value">{account_id}</div>
+            </div>
+            <div class="card">
+                <h3>Current Balance</h3>
+                <div class="value">{balance}</div>
+            </div>
+        </div>
+        <div class="card" style="margin-bottom: 30px;">
+            <h3>Active Open Positions</h3>
+            {positions_html}
+        </div>
+        """
+    # 3. Construct signal logs history HTML
+    logs_html = ""
+    if WEBHOOK_LOGS:
+        logs_html = "".join(
+            f'<div class="log-item"><span class="log-time">[{l["time"]}]</span> '
+            f'<span class="log-action" style="color: {l["color"]}">{l["action"]}</span> {l["msg"]}</div>'
+            for l in reversed(WEBHOOK_LOGS)
+        )
+    else:
+        logs_html = '<div style="color: #64748b;">Waiting for signals from TradingView...</div>'
+    status_badge_html = (
+        '<span class="status-badge status-connected">✓ Connected</span>'
+        if is_authenticated
+        else '<span class="status-badge status-disconnected">✗ Disconnected</span>'
+    )
+    error_banner_html = f'<div class="alert-danger">{error_msg}</div>' if error_msg else ''
+    # Main HTML Dashboard String
     html_content = f"""
     <!DOCTYPE html>
     <html>
                     <p style="margin: 5px 0 0 0; color: #64748b;">Hugging Face Cloud Server ({CTRADER_ENV} environment)</p>
                 </div>
                 <div>
+                    {status_badge_html}
                 </div>
             </div>
+            {error_banner_html}
+            {auth_card_html}
             <div class="card">
                 <h3>Webhook Signal History</h3>
                 <div class="log-feed">
+                    {logs_html}
                 </div>
             </div>
         </div>