diff --git a/app/analysis/page.js b/app/analysis/page.js index 5a8560b..82d377f 100644 --- a/app/analysis/page.js +++ b/app/analysis/page.js @@ -1,86 +1,21 @@ 'use client' -import React, { useState } from 'react' -import AIAnalysisPanel from '../../components/AIAnalysisPanel.tsx' -import TradeExecutionPanel from '../../components/TradeExecutionPanel.js' + +import AIAnalysisPanel from '../../components/AIAnalysisPanel' export default function AnalysisPage() { - const [analysisResult, setAnalysisResult] = useState(null) - const [currentSymbol, setCurrentSymbol] = useState('SOL') - - const handleAnalysisComplete = (analysis, symbol) => { - setAnalysisResult(analysis) - setCurrentSymbol(symbol || 'SOL') - } - return (
-
-
-

AI Analysis & Trading

-

Get comprehensive market insights powered by AI analysis and execute trades

-
+
+

+ ๐Ÿค– AI-Powered Market Analysis +

+

+ Get professional trading insights with multi-timeframe analysis, precise entry/exit levels, + and institutional-quality recommendations powered by OpenAI. +

-
- {/* Left Column - AI Analysis */} -
-
-

๐Ÿ“Š AI Market Analysis

- -
-
- - {/* Right Column - Trading Panel */} -
-
-

๐Ÿ’ฐ Execute Trade

- -
- - {/* Analysis Summary */} - {analysisResult && ( -
-

๐ŸŽฏ Analysis Summary

-
-
- Symbol: - {currentSymbol} -
-
- Sentiment: - - {analysisResult.sentiment} - -
- {analysisResult.entryPrice && ( -
- Entry Price: - ${analysisResult.entryPrice} -
- )} - {analysisResult.stopLoss && ( -
- Stop Loss: - ${analysisResult.stopLoss} -
- )} - {analysisResult.takeProfit && ( -
- Take Profit: - ${analysisResult.takeProfit} -
- )} -
-
- )} -
-
+
) } diff --git a/app/chart-trading-demo/page.tsx b/app/chart-trading-demo/page.tsx index 3e46069..f6b964c 100644 --- a/app/chart-trading-demo/page.tsx +++ b/app/chart-trading-demo/page.tsx @@ -27,37 +27,27 @@ export default function ChartTradingDemo() { const [isPayingTokenDropdownOpen, setIsPayingTokenDropdownOpen] = useState(false) const dropdownRef = useRef(null) const payingTokenDropdownRef = useRef(null) - const [positions, setPositions] = useState([ - // Mock position data for demo - { - id: 'demo_pos_1', - symbol: 'SOL/USDC', - side: 'BUY' as 'BUY' | 'SELL', - amount: 0.5, - entryPrice: 165.50, - stopLoss: 160.00, - takeProfit: 170.00, - currentPrice: 166.21, - unrealizedPnl: 0.355, - leverage: 2, - } - ]) + const [positions, setPositions] = useState([]) + const [isLoading, setIsLoading] = useState(false) + const [tradeStatus, setTradeStatus] = useState('') + const [liveBalances, setLiveBalances] = useState<{[key: string]: number}>({}) + const [marketPrices, setMarketPrices] = useState<{[key: string]: {price: number, change: number}}>({}); const symbols = [ - { symbol: 'SOL', name: 'Solana', price: 166.21, change: 2.45, icon: '๐ŸŸฃ' }, - { symbol: 'BTC', name: 'Bitcoin', price: 42150.00, change: -1.23, icon: '๐ŸŸ ' }, - { symbol: 'ETH', name: 'Ethereum', price: 2580.50, change: 3.12, icon: 'โฌœ' }, - { symbol: 'BONK', name: 'Bonk', price: 0.00003456, change: 15.67, icon: '๐Ÿ•' }, - { symbol: 'JUP', name: 'Jupiter', price: 0.8234, change: 5.43, icon: '๐Ÿช' }, - { symbol: 'WIF', name: 'dogwifhat', price: 3.42, change: -8.21, icon: '๐Ÿงข' }, + { symbol: 'SOL', name: 'Solana', price: marketPrices.SOL?.price || 166.21, change: marketPrices.SOL?.change || 2.45, icon: '๐ŸŸฃ' }, + { symbol: 'BTC', name: 'Bitcoin', price: marketPrices.BTC?.price || 42150.00, change: marketPrices.BTC?.change || -1.23, icon: '๐ŸŸ ' }, + { symbol: 'ETH', name: 'Ethereum', price: marketPrices.ETH?.price || 2580.50, change: marketPrices.ETH?.change || 3.12, icon: 'โฌœ' }, + { symbol: 'BONK', name: 'Bonk', price: marketPrices.BONK?.price || 0.00003456, change: marketPrices.BONK?.change || 15.67, icon: '๐Ÿ•' }, + { symbol: 'JUP', name: 'Jupiter', price: marketPrices.JUP?.price || 0.8234, change: marketPrices.JUP?.change || 5.43, icon: '๐Ÿช' }, + { symbol: 'WIF', name: 'dogwifhat', price: marketPrices.WIF?.price || 3.42, change: marketPrices.WIF?.change || -8.21, icon: '๐Ÿงข' }, ] const payingTokens = [ - { symbol: 'USDC', name: 'USD Coin', balance: 1234.56, icon: '๐Ÿ’ต' }, - { symbol: 'USDT', name: 'Tether', balance: 892.34, icon: '๐Ÿ’ฐ' }, - { symbol: 'SOL', name: 'Solana', balance: 5.42, icon: '๐ŸŸฃ' }, - { symbol: 'BTC', name: 'Bitcoin', balance: 0.025, icon: '๐ŸŸ ' }, - { symbol: 'ETH', name: 'Ethereum', balance: 1.85, icon: 'โฌœ' }, + { symbol: 'USDC', name: 'USD Coin', balance: liveBalances.USDC || 0, icon: '๐Ÿ’ต' }, + { symbol: 'USDT', name: 'Tether', balance: liveBalances.USDT || 0, icon: '๐Ÿ’ฐ' }, + { symbol: 'SOL', name: 'Solana', balance: liveBalances.SOL || 0, icon: '๐ŸŸฃ' }, + { symbol: 'BTC', name: 'Bitcoin', balance: liveBalances.BTC || 0, icon: '๐ŸŸ ' }, + { symbol: 'ETH', name: 'Ethereum', balance: liveBalances.ETH || 0, icon: 'โฌœ' }, ] // Close dropdown when clicking outside @@ -77,18 +67,70 @@ export default function ChartTradingDemo() { } }, []) + // Load real wallet balances and positions + useEffect(() => { + const loadRealData = async () => { + try { + // Fetch real wallet balances + const balanceResponse = await fetch('/api/wallet/balance') + if (balanceResponse.ok) { + const balanceData = await balanceResponse.json() + if (balanceData.success && balanceData.balance?.positions) { + // Convert positions array to balances object + const balances: {[key: string]: number} = {} + balanceData.balance.positions.forEach((position: any) => { + balances[position.symbol] = position.amount + }) + setLiveBalances(balances) + console.log('โœ… Loaded wallet balances:', balances) + } + } + + // Fetch real positions + const positionsResponse = await fetch('/api/trading/positions') + if (positionsResponse.ok) { + const positionsData = await positionsResponse.json() + if (positionsData.success) { + setPositions(positionsData.positions || []) + } + } + + // Fetch market prices + const pricesResponse = await fetch('/api/prices') + if (pricesResponse.ok) { + const pricesData = await pricesResponse.json() + if (pricesData.success) { + setMarketPrices(pricesData.prices || {}) + } + } + } catch (error) { + console.error('Error loading real data:', error) + setTradeStatus('Error loading wallet data') + } + } + + loadRealData() + + // Refresh data every 30 seconds + const interval = setInterval(loadRealData, 30000) + return () => clearInterval(interval) + }, []) + const getCurrentSymbolData = () => { return symbols.find(s => s.symbol === selectedSymbol) || symbols[0] } const getCurrentPayingTokenData = () => { - return payingTokens.find(t => t.symbol === payingToken) || payingTokens[0] + const tokenData = payingTokens.find(t => t.symbol === payingToken) || payingTokens[0] + console.log(`Getting token data for ${payingToken}:`, tokenData, 'Live balances:', liveBalances) + return tokenData } // Calculate receiving amount based on paying amount useEffect(() => { if (payingAmount && payingToken === 'USDC') { - const symbolPrice = getCurrentSymbolData().price + const symbolData = getCurrentSymbolData() + const symbolPrice = symbolData.price const receiving = parseFloat(payingAmount) / symbolPrice setReceivingAmount(receiving.toFixed(6)) } else if (payingAmount && payingToken === selectedSymbol) { @@ -98,39 +140,150 @@ export default function ChartTradingDemo() { } }, [payingAmount, payingToken, selectedSymbol]) - const handleTrade = (side: 'BUY' | 'SELL') => { + const handleTrade = async (side: 'BUY' | 'SELL') => { const amount = parseFloat(payingAmount) - const symbolData = getCurrentSymbolData() if (!amount || amount <= 0) { alert('Please enter a valid amount') return } - const newPosition: Position = { - id: `pos_${Date.now()}`, - symbol: `${selectedSymbol}/USDC`, - side, - amount, - entryPrice: symbolData.price, - stopLoss: stopLoss ? parseFloat(stopLoss) : symbolData.price * (side === 'BUY' ? 0.95 : 1.05), - takeProfit: takeProfit ? parseFloat(takeProfit) : symbolData.price * (side === 'BUY' ? 1.05 : 0.95), - currentPrice: symbolData.price, - unrealizedPnl: 0, - leverage, - } + setIsLoading(true) + setTradeStatus(`Executing ${side} order...`) - setPositions(prev => [...prev, newPosition]) - setPayingAmount('') - setReceivingAmount('') - setStopLoss('') - setTakeProfit('') - alert(`${side} order placed (demo)`) + try { + // Execute real trade based on leverage + const tradeEndpoint = leverage > 1 ? '/api/trading/execute-perp' : '/api/trading/execute-dex' + + const tradePayload = { + symbol: selectedSymbol, + side, + amount, + stopLoss: stopLoss ? parseFloat(stopLoss) : undefined, + takeProfit: takeProfit ? parseFloat(takeProfit) : undefined, + leverage: leverage > 1 ? leverage : undefined, + fromCoin: payingToken, + toCoin: selectedSymbol, + useRealDEX: true + } + + console.log('Executing trade:', tradePayload) + + const response = await fetch(tradeEndpoint, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(tradePayload) + }) + + const result = await response.json() + + if (result.success) { + setTradeStatus(`${side} order executed successfully!`) + + // Refresh positions and balances + const positionsResponse = await fetch('/api/trading/positions') + if (positionsResponse.ok) { + const positionsData = await positionsResponse.json() + if (positionsData.success) { + setPositions(positionsData.positions || []) + } + } + + const balanceResponse = await fetch('/api/wallet/balance') + if (balanceResponse.ok) { + const balanceData = await balanceResponse.json() + if (balanceData.success && balanceData.balance?.positions) { + // Convert positions array to balances object + const balances: {[key: string]: number} = {} + balanceData.balance.positions.forEach((position: any) => { + balances[position.symbol] = position.amount + }) + setLiveBalances(balances) + } + } + + // Clear form + setPayingAmount('') + setReceivingAmount('') + setStopLoss('') + setTakeProfit('') + + alert(`โœ… ${side} order executed successfully!\nTransaction: ${result.signature || 'Completed'}`) + } else { + setTradeStatus(`Trade failed: ${result.error || 'Unknown error'}`) + alert(`โŒ Trade failed: ${result.message || result.error || 'Unknown error'}`) + } + } catch (error) { + console.error('Trade execution error:', error) + setTradeStatus('Trade execution failed') + alert('โŒ Trade execution failed. Please try again.') + } finally { + setIsLoading(false) + setTimeout(() => setTradeStatus(''), 5000) + } } - const handleClosePosition = (positionId: string) => { - setPositions(prev => prev.filter(pos => pos.id !== positionId)) - alert('Position closed (demo)') + const handleClosePosition = async (positionId: string) => { + const position = positions.find(pos => pos.id === positionId) + if (!position) return + + if (!confirm(`Are you sure you want to close ${position.symbol} ${position.side} position?`)) { + return + } + + setIsLoading(true) + setTradeStatus('Closing position...') + + try { + const response = await fetch(`/api/trading/positions/${positionId}`, { + method: 'DELETE', + headers: { + 'Content-Type': 'application/json', + }, + }) + + const result = await response.json() + + if (result.success) { + setTradeStatus('Position closed successfully!') + + // Refresh positions and balances + const positionsResponse = await fetch('/api/trading/positions') + if (positionsResponse.ok) { + const positionsData = await positionsResponse.json() + if (positionsData.success) { + setPositions(positionsData.positions || []) + } + } + + const balanceResponse = await fetch('/api/wallet/balance') + if (balanceResponse.ok) { + const balanceData = await balanceResponse.json() + if (balanceData.success && balanceData.balance?.positions) { + // Convert positions array to balances object + const balances: {[key: string]: number} = {} + balanceData.balance.positions.forEach((position: any) => { + balances[position.symbol] = position.amount + }) + setLiveBalances(balances) + } + } + + alert(`โœ… Position closed successfully!\nP&L: ${result.realizedPnl ? (result.realizedPnl >= 0 ? '+' : '') + '$' + result.realizedPnl.toFixed(2) : 'Calculated at settlement'}`) + } else { + setTradeStatus(`Failed to close position: ${result.error}`) + alert(`โŒ Failed to close position: ${result.message || result.error}`) + } + } catch (error) { + console.error('Position close error:', error) + setTradeStatus('Failed to close position') + alert('โŒ Failed to close position. Please try again.') + } finally { + setIsLoading(false) + setTimeout(() => setTradeStatus(''), 5000) + } } return ( @@ -172,7 +325,7 @@ export default function ChartTradingDemo() {
-

Chart Trading Terminal

+

Live Trading Terminal

{/* Symbol Selector Dropdown */}
@@ -247,9 +400,14 @@ export default function ChartTradingDemo() { {/* Market Status */}
-
- Demo Mode +
+ {isLoading ? 'Processing...' : 'Live Trading'}
+ {tradeStatus && ( +
+ {tradeStatus} +
+ )}
{new Date().toLocaleTimeString()}
@@ -331,17 +489,17 @@ export default function ChartTradingDemo() {
@@ -385,24 +543,23 @@ export default function ChartTradingDemo() { onClick={() => { setPayingToken(symbol) setIsPayingTokenDropdownOpen(false) - }} - className={`w-full flex items-center justify-between px-3 py-2 text-left rounded-lg transition-all ${ - payingToken === symbol - ? 'bg-blue-600/20 border border-blue-500/30' - : 'hover:bg-gray-700' - }`} - > -
- {icon} -
-
{symbol}
-
{name}
-
-
-
- {balance.toLocaleString()} -
- + }} className={`w-full flex items-center justify-between px-3 py-2 text-left rounded-lg transition-all ${ + payingToken === symbol + ? 'bg-blue-600/20 border border-blue-500/30' + : 'hover:bg-gray-700' + }`} + > +
+ {icon} +
+
{symbol}
+
{name}
+
+
+
+ {balance.toFixed(balance < 1 ? 6 : 2)} +
+ ))}
@@ -412,14 +569,25 @@ export default function ChartTradingDemo() { {/* Balance and MAX button */}
- Balance: {getCurrentPayingTokenData().balance.toLocaleString()} {payingToken} + Balance: {getCurrentPayingTokenData().balance.toFixed(getCurrentPayingTokenData().balance < 1 ? 6 : 2)} {payingToken}
+ {getCurrentPayingTokenData().balance === 0 && ( +
+ โš ๏ธ No {payingToken} balance available +
+ )} + {payingAmount && parseFloat(payingAmount) > getCurrentPayingTokenData().balance && ( +
+ โš ๏ธ Insufficient balance ({getCurrentPayingTokenData().balance.toFixed(getCurrentPayingTokenData().balance < 1 ? 6 : 2)} {payingToken} available) +
+ )}
{leverage > 1 && payingAmount && (
@@ -522,7 +690,13 @@ export default function ChartTradingDemo() { {/* Positions Table */}
- {positions.length === 0 ? ( + {isLoading && positions.length === 0 && ( +
+
+ Loading positions... +
+ )} + {!isLoading && positions.length === 0 ? (
No open positions
@@ -577,9 +751,10 @@ export default function ChartTradingDemo() {
diff --git a/components/TradeModal.tsx b/components/TradeModal.tsx index fb765c7..3b3e599 100644 --- a/components/TradeModal.tsx +++ b/components/TradeModal.tsx @@ -7,10 +7,13 @@ interface TradeModalProps { tradeData: { entry: string tp: string + tp2?: string sl: string - risk: string - reward: string - action: 'BUY' | 'SELL' + symbol?: string + timeframe?: string + risk?: string + reward?: string + action?: 'BUY' | 'SELL' } | null onExecute: (data: any) => void } @@ -55,6 +58,21 @@ export default function TradeModal({ isOpen, onClose, tradeData, onExecute }: Tr } }, [isOpen]) + // Update form data when tradeData changes + useEffect(() => { + if (tradeData) { + console.log('๐Ÿ”„ TradeModal updating form with new tradeData:', tradeData) + setFormData(prev => ({ + ...prev, + entry: tradeData.entry || '', + tp1: tradeData.tp || '', + tp2: tradeData.tp2 || '', + sl: tradeData.sl || '', + tradingCoin: tradeData.symbol ? tradeData.symbol.replace('USD', '') : 'SOL' + })) + } + }, [tradeData]) + const fetchWalletBalance = async () => { try { const response = await fetch('/api/wallet/balance')