Compare commits
No commits in common. "eafbb4a25d0f9e4c2c4d1eb6931c4d4d8ea3c24b" and "3a9236576efe5fa03148805972484df31f7f3758" have entirely different histories.
eafbb4a25d
...
3a9236576e
Binary file not shown.
|
|
@ -118,9 +118,11 @@ async def record_buy(pair: str, qty: float, price: float):
|
||||||
"""Record a buy trade"""
|
"""Record a buy trade"""
|
||||||
trading_state['current_trades'][pair] = {
|
trading_state['current_trades'][pair] = {
|
||||||
'qty': qty,
|
'qty': qty,
|
||||||
'entry_price': price,
|
'buy_price': price,
|
||||||
'entry_time': datetime.now().isoformat(),
|
'buy_time': datetime.now().isoformat(),
|
||||||
'type': 'BUY'
|
'peak_profit': 0,
|
||||||
|
'trailing_stop': None,
|
||||||
|
'order_id': None
|
||||||
}
|
}
|
||||||
trading_state['trades_today'] += 1
|
trading_state['trades_today'] += 1
|
||||||
await broadcast_update()
|
await broadcast_update()
|
||||||
|
|
@ -208,207 +210,196 @@ html_content = """
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Trading Bot Dashboard</title>
|
<title>Trading Bot Dashboard</title>
|
||||||
<style>
|
<style>
|
||||||
* {
|
* {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
background-color: #0a0a0a;
|
||||||
background: linear-gradient(135deg, #0f0c29 0%, #302b63 100%);
|
color: #e0e0e0;
|
||||||
color: #e0e0e0;
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Inter', sans-serif;
|
||||||
padding: 20px;
|
line-height: 1.8;
|
||||||
min-height: 100vh;
|
letter-spacing: 0.3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.container {
|
.header {
|
||||||
max-width: 1400px;
|
background-color: #121212;
|
||||||
margin: 0 auto;
|
border-bottom: 1px solid #1f1f1f;
|
||||||
}
|
padding: 40px 60px;
|
||||||
|
}
|
||||||
.header {
|
|
||||||
text-align: center;
|
.header h1 {
|
||||||
margin-bottom: 30px;
|
color: #ffffff;
|
||||||
border-bottom: 2px solid #6c63ff;
|
font-size: 32px;
|
||||||
padding-bottom: 20px;
|
font-weight: 700;
|
||||||
}
|
letter-spacing: -0.5px;
|
||||||
|
}
|
||||||
.header h1 {
|
|
||||||
font-size: 2.5em;
|
.container {
|
||||||
color: #6c63ff;
|
max-width: 1800px;
|
||||||
margin-bottom: 10px;
|
margin: 0 auto;
|
||||||
}
|
padding: 60px 60px;
|
||||||
|
}
|
||||||
.status {
|
|
||||||
display: inline-block;
|
.grid-auto {
|
||||||
padding: 8px 16px;
|
display: grid;
|
||||||
background: #00c853;
|
grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
|
||||||
color: white;
|
gap: 24px;
|
||||||
border-radius: 20px;
|
margin-bottom: 60px;
|
||||||
font-weight: bold;
|
}
|
||||||
font-size: 0.9em;
|
|
||||||
}
|
.card {
|
||||||
|
background-color: #1a1a1a;
|
||||||
.grid {
|
border: 1px solid #2a2a2a;
|
||||||
display: grid;
|
border-radius: 16px;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
|
padding: 28px;
|
||||||
gap: 20px;
|
backdrop-filter: blur(10px);
|
||||||
margin-bottom: 30px;
|
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
}
|
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
|
||||||
|
}
|
||||||
.card {
|
|
||||||
background: rgba(255, 255, 255, 0.1);
|
.card:hover {
|
||||||
border: 1px solid #6c63ff;
|
background-color: #1f1f1f;
|
||||||
border-radius: 10px;
|
border-color: #3a3a3a;
|
||||||
padding: 20px;
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.20);
|
||||||
backdrop-filter: blur(10px);
|
}
|
||||||
transition: all 0.3s ease;
|
|
||||||
}
|
.card-label {
|
||||||
|
color: #888888;
|
||||||
.card:hover {
|
font-size: 12px;
|
||||||
background: rgba(255, 255, 255, 0.15);
|
text-transform: uppercase;
|
||||||
border-color: #00c853;
|
letter-spacing: 1.2px;
|
||||||
transform: translateY(-5px);
|
margin-bottom: 12px;
|
||||||
}
|
font-weight: 600;
|
||||||
|
}
|
||||||
.card-title {
|
|
||||||
color: #6c63ff;
|
.card-value {
|
||||||
font-size: 0.9em;
|
color: #ffffff;
|
||||||
text-transform: uppercase;
|
font-size: 36px;
|
||||||
letter-spacing: 1px;
|
font-weight: 700;
|
||||||
margin-bottom: 10px;
|
line-height: 1.2;
|
||||||
}
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
.card-value {
|
|
||||||
font-size: 2em;
|
.card-subtitle {
|
||||||
font-weight: bold;
|
color: #666666;
|
||||||
color: #e0e0e0;
|
font-size: 13px;
|
||||||
margin-bottom: 5px;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
|
|
||||||
.card-sub {
|
.card-positive {
|
||||||
color: #a0a0a0;
|
color: #2ecc71;
|
||||||
font-size: 0.85em;
|
}
|
||||||
}
|
|
||||||
|
.card-negative {
|
||||||
.positive {
|
color: #e74c3c;
|
||||||
color: #00c853;
|
}
|
||||||
}
|
|
||||||
|
.section-title {
|
||||||
.negative {
|
color: #ffffff;
|
||||||
color: #ff3d00;
|
font-size: 24px;
|
||||||
}
|
font-weight: 700;
|
||||||
|
margin: 60px 0 32px 0;
|
||||||
.section {
|
letter-spacing: -0.3px;
|
||||||
margin-bottom: 30px;
|
}
|
||||||
}
|
|
||||||
|
.content-block {
|
||||||
.section-title {
|
background-color: #1a1a1a;
|
||||||
color: #6c63ff;
|
border: 1px solid #2a2a2a;
|
||||||
font-size: 1.5em;
|
border-radius: 16px;
|
||||||
margin-bottom: 15px;
|
padding: 32px;
|
||||||
border-bottom: 1px solid #6c63ff;
|
margin-bottom: 40px;
|
||||||
padding-bottom: 10px;
|
}
|
||||||
}
|
|
||||||
|
table {
|
||||||
.trades-list {
|
width: 100%;
|
||||||
display: grid;
|
border-collapse: collapse;
|
||||||
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
|
}
|
||||||
gap: 15px;
|
|
||||||
}
|
th {
|
||||||
|
background-color: #121212;
|
||||||
.trade-card {
|
color: #b0b0b0;
|
||||||
background: rgba(255, 255, 255, 0.08);
|
padding: 16px 20px;
|
||||||
border-left: 4px solid #6c63ff;
|
text-align: left;
|
||||||
border-radius: 5px;
|
font-size: 12px;
|
||||||
padding: 15px;
|
font-weight: 700;
|
||||||
font-size: 0.9em;
|
text-transform: uppercase;
|
||||||
}
|
letter-spacing: 1px;
|
||||||
|
border-bottom: 1px solid #2a2a2a;
|
||||||
.trade-card.open {
|
}
|
||||||
border-left-color: #6c63ff;
|
|
||||||
}
|
td {
|
||||||
|
padding: 16px 20px;
|
||||||
.trade-card.closed {
|
border-bottom: 1px solid #1f1f1f;
|
||||||
border-left-color: #00c853;
|
color: #d0d0d0;
|
||||||
}
|
font-size: 14px;
|
||||||
|
}
|
||||||
.trade-pair {
|
|
||||||
font-weight: bold;
|
tr:last-child td {
|
||||||
color: #6c63ff;
|
border-bottom: none;
|
||||||
margin-bottom: 8px;
|
}
|
||||||
}
|
|
||||||
|
tbody tr:hover {
|
||||||
.trade-info {
|
background-color: #0f0f0f;
|
||||||
display: grid;
|
}
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 10px;
|
.status-badge {
|
||||||
font-size: 0.85em;
|
display: inline-block;
|
||||||
color: #a0a0a0;
|
padding: 6px 12px;
|
||||||
}
|
border-radius: 8px;
|
||||||
|
font-size: 11px;
|
||||||
.trade-info strong {
|
font-weight: 600;
|
||||||
color: #e0e0e0;
|
text-transform: uppercase;
|
||||||
}
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
.swap-item {
|
|
||||||
background: rgba(255, 255, 255, 0.05);
|
.badge-live {
|
||||||
padding: 10px;
|
background-color: #1a1a1a;
|
||||||
border-radius: 5px;
|
color: #888888;
|
||||||
margin-bottom: 8px;
|
border: 1px solid #2a2a2a;
|
||||||
font-size: 0.85em;
|
}
|
||||||
}
|
|
||||||
|
.badge-profit {
|
||||||
.performance-grid {
|
background-color: rgba(46, 204, 113, 0.15);
|
||||||
display: grid;
|
color: #2ecc71;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
|
}
|
||||||
gap: 15px;
|
|
||||||
}
|
.badge-loss {
|
||||||
|
background-color: rgba(231, 76, 60, 0.15);
|
||||||
.stat-card {
|
color: #e74c3c;
|
||||||
background: rgba(108, 99, 255, 0.2);
|
}
|
||||||
border: 1px solid #6c63ff;
|
|
||||||
border-radius: 8px;
|
.metric-row {
|
||||||
padding: 15px;
|
display: grid;
|
||||||
text-align: center;
|
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
||||||
}
|
gap: 20px;
|
||||||
|
margin-bottom: 40px;
|
||||||
.stat-label {
|
}
|
||||||
color: #a0a0a0;
|
|
||||||
font-size: 0.8em;
|
.spacer {
|
||||||
text-transform: uppercase;
|
height: 1px;
|
||||||
margin-bottom: 8px;
|
background-color: #1f1f1f;
|
||||||
}
|
margin: 40px 0;
|
||||||
|
}
|
||||||
.stat-value {
|
|
||||||
font-size: 1.8em;
|
.footer-text {
|
||||||
font-weight: bold;
|
color: #666666;
|
||||||
color: #00c853;
|
font-size: 12px;
|
||||||
}
|
text-align: right;
|
||||||
|
margin-top: 40px;
|
||||||
.stat-value.loss {
|
padding-top: 20px;
|
||||||
color: #ff3d00;
|
border-top: 1px solid #1f1f1f;
|
||||||
}
|
}
|
||||||
|
|
||||||
.update-time {
|
.empty-state {
|
||||||
text-align: right;
|
text-align: center;
|
||||||
color: #666;
|
color: #555555;
|
||||||
font-size: 0.8em;
|
padding: 60px 20px;
|
||||||
margin-top: 20px;
|
font-size: 14px;
|
||||||
padding-top: 20px;
|
}
|
||||||
border-top: 1px solid #333;
|
</style>
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes fadeIn {
|
|
||||||
from { opacity: 0; }
|
|
||||||
to { opacity: 1; }
|
|
||||||
}
|
|
||||||
|
|
||||||
.fade-in {
|
|
||||||
animation: fadeIn 0.3s ease-in;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
@ -519,23 +510,23 @@ html_content = """
|
||||||
// Update key metrics - CHF PRIMARY, USD secondary
|
// Update key metrics - CHF PRIMARY, USD secondary
|
||||||
const usdt = data.balance.USDT || 0;
|
const usdt = data.balance.USDT || 0;
|
||||||
const usdt_chf = usdt * 0.84;
|
const usdt_chf = usdt * 0.84;
|
||||||
document.getElementById('usdt').textContent = `$${usdt.toFixed(2)} / CHF ${usdt_chf.toFixed(2)}`;
|
document.getElementById('usdt').textContent = `$${usdt.toFixed(2)}`;
|
||||||
|
|
||||||
const portfolio_usd = data.portfolio_value_usd || 0;
|
const portfolio_usd = data.portfolio_value_usd || 0;
|
||||||
const portfolio_chf = data.portfolio_value_chf || (portfolio_usd * 0.84);
|
const portfolio_chf = data.portfolio_value_chf || (portfolio_usd * 0.84);
|
||||||
document.getElementById('portfolio').textContent = `$${portfolio_usd.toFixed(2)} / CHF ${portfolio_chf.toFixed(2)}`;
|
document.getElementById('portfolio').textContent = `$${portfolio_usd.toFixed(2)}`;
|
||||||
|
|
||||||
// Update P&L with color - CHF primary
|
// Update P&L with color - CHF primary
|
||||||
const dailyPnl = data.daily_pnl || 0;
|
const dailyPnl = data.daily_pnl || 0;
|
||||||
const dailyPnl_chf = dailyPnl * 0.84;
|
const dailyPnl_chf = dailyPnl * 0.84;
|
||||||
const dailyPnlEl = document.getElementById('daily-pnl');
|
const dailyPnlEl = document.getElementById('daily-pnl');
|
||||||
dailyPnlEl.textContent = `$${dailyPnl >= 0 ? '+' : ''}${dailyPnl.toFixed(2)} / CHF ${dailyPnl_chf >= 0 ? '+' : ''}${dailyPnl_chf.toFixed(2)}`;
|
dailyPnlEl.textContent = `$${dailyPnl >= 0 ? '+' : ''}${dailyPnl.toFixed(2)}`;
|
||||||
dailyPnlEl.className = 'card-value ' + (dailyPnl >= 0 ? 'positive' : 'negative');
|
dailyPnlEl.className = 'card-value ' + (dailyPnl >= 0 ? 'positive' : 'negative');
|
||||||
|
|
||||||
const totalPnl = data.total_pnl || 0;
|
const totalPnl = data.total_pnl || 0;
|
||||||
const totalPnl_chf = totalPnl * 0.84;
|
const totalPnl_chf = totalPnl * 0.84;
|
||||||
const totalPnlEl = document.getElementById('total-pnl');
|
const totalPnlEl = document.getElementById('total-pnl');
|
||||||
totalPnlEl.textContent = `$${totalPnl >= 0 ? '+' : ''}${totalPnl.toFixed(2)} / CHF ${totalPnl_chf >= 0 ? '+' : ''}${totalPnl_chf.toFixed(2)}`;
|
totalPnlEl.textContent = `$${totalPnl >= 0 ? '+' : ''}${totalPnl.toFixed(2)}`;
|
||||||
totalPnlEl.className = 'card-value ' + (totalPnl >= 0 ? 'positive' : 'negative');
|
totalPnlEl.className = 'card-value ' + (totalPnl >= 0 ? 'positive' : 'negative');
|
||||||
|
|
||||||
// Update performance
|
// Update performance
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue