Commit Graph

427 Commits

Author SHA1 Message Date
Z
1cc43cec60 Merge branch 'tinkle-community:dev' into dev 2025-11-01 02:57:18 +08:00
tinkle-community
b87fcb62bd Merge pull request #151 from Icyoung/dev
Dev 竞赛fix、交易员新增参数
2025-11-01 02:42:42 +08:00
icy
3033a1308d 删除未使用的AlertTriangle导入
🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-01 02:34:33 +08:00
icy
19bb5a3a54 手动合并冲突,保留TraderConfigModal功能并添加lucide-react图标支持
- 解决AITradersPage.tsx合并冲突,保留TraderConfigModal导入
- 添加lucide-react图标库支持
- 保留信号源配置的OI TOP URL功能
- 使用我们版本解决其他文件冲突,保持UI简洁
- 确保编译成功和依赖正确安装

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-01 02:33:37 +08:00
Luna Martinez
c35841fa43 Merge pull request #134 from tpkeeper/dev
fix(mcp/client): correct receiver name
2025-10-31 14:25:20 -04:00
icy
9fe8f1a1e7 Merge branch 'dev' of github.com:Icyoung/nofx
# Conflicts:
#	manager/trader_manager.go
#	web/src/components/AITradersPage.tsx
2025-11-01 02:23:05 +08:00
tinkle-community
9a675da33d Merge pull request #138 from zhoujunhehe/dev
UI feat: enhance UI with Lucide icons & add LOGO
2025-11-01 02:21:44 +08:00
icy
a7cc5e5ed4 竞赛fix、交易员新增参数 2025-11-01 02:17:11 +08:00
ZhouYongyou
17ad15ca4e refactor: unify to simplified Chinese in logs 2025-11-01 00:25:58 +08:00
ZhouYongyou
cf8bf6e42d Merge branch 'dev' of https://github.com/tinkle-community/nofx into dev 2025-11-01 00:01:41 +08:00
ZhouYongyou
396df86367 Cancel orphan orders when position is closed
Added logic to automatically cancel all orders for a symbol when its position disappears, ensuring orphan stop-loss/take-profit orders are cleaned up. This improves order management and prevents unintended trades after a position is closed.
2025-11-01 00:01:38 +08:00
Ember
36ab823ed2 UI feat: replace Lucide icons with logo images in multiple components 2025-10-31 23:54:10 +08:00
Ember
9e64b1303f feat: enhance UI with Lucide icons across various components
- add logo
- Replaced emoji placeholders with Lucide icons in AITradersPage, CompetitionPage, EquityChart, Header, LoginPage, and RegisterPage for improved visual consistency.
- Updated button styles to include icons for actions like adding models and exchanges.
- Enhanced error and empty state displays with relevant icons to provide better user feedback.
2025-10-31 23:28:19 +08:00
tinkle-community
e65e11a08a Merge pull request #132 from SkywalkerJi/dev
Fix custom leverage and currency settings
2025-10-31 22:59:47 +08:00
ZhouYongyou
8e5a35e664 Add multi-timeframe data analysis support
Introduces 15m and 1h timeframes to Data struct and related calculations for more robust multi-timeframe analysis. Updates system prompt to reflect new data sources and analysis methods, and extends Format output to include mid-term series. Enhances signal quality and trend confirmation by leveraging multiple timeframes.
2025-10-31 22:41:13 +08:00
tinkle-community
fb3ca40d43 Merge pull request #133 from zhoujunhehe/dev
Fix: Add proper validation for Aster DEX exchange in trader creation
2025-10-31 22:27:36 +08:00
tpkeeper
69445594e3 optimize(mcp/client): correct receiver name 2025-10-31 22:24:10 +08:00
Ember
748cca07d7 Fix: Add proper validation for Aster DEX exchange in trader creation
- Add specific field validation for Aster exchange (asterUser, asterSigner, asterPrivateKey)
- Add specific field validation for Hyperliquid exchange (apiKey, hyperliquidWalletAddr)
- Keep existing validation for Binance (apiKey, secretKey)
- Remove debug console logs
- Fix issue where Aster exchange was not appearing in trader creation dropdown

This ensures all three supported exchanges can be properly selected when creating a new AI trader.
2025-10-31 21:40:21 +08:00
SkywalkerJi
91fcfb0ec5 Fix coin settings 2025-10-31 21:05:53 +08:00
SkywalkerJi
f58c874aaf Fix leverage settings 2025-10-31 21:05:13 +08:00
tinkle-community
93e5703df8 Merge pull request #125 from SkywalkerJi/dev
Ignore the database to avoid submitting sensitive data.
2025-10-31 18:40:17 +08:00
SkywalkerJi
e75c834372 Change the minimum amount to 50 and remove the maximum amount limit. 2025-10-31 18:34:48 +08:00
SkywalkerJi
6843c93a86 Ignore the database to avoid submitting sensitive data. 2025-10-31 18:30:36 +08:00
tinkle-community
00cc38c384 Merge pull request #116 from Icyoung/dev
Dev start script fix
2025-10-31 15:58:04 +08:00
Icyoung
507a6b6068 Merge branch 'tinkle-community:dev' into dev 2025-10-31 15:55:06 +08:00
icy
67f8e0f924 Fix docker compose bug for config.db 2025-10-31 15:53:48 +08:00
tinkle-community
511addf867 Merge pull request #114 from Icyoung/dev
[Dev] 还原config配置、部署优化
2025-10-31 15:50:23 +08:00
icy
c8c185f147 Add config.db volume mapping to docker-compose
- Map config.db to host for database persistence
- Ensures user configurations, traders, and AI models persist across container restarts
- Enables easy backup of configuration database

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-31 15:31:47 +08:00
icy
9f44aa641c Merge branch 'dev' of github.com:Icyoung/nofx 2025-10-31 15:26:04 +08:00
icy
8296d9843a Sync config.json to config.db for manual modify admin_mode and other configs 2025-10-31 15:24:18 +08:00
Icyoung
cf9d09b403 Merge branch 'tinkle-community:dev' into dev 2025-10-31 14:47:56 +08:00
icy
3405f0dd3b start scrip fix 2025-10-31 14:41:45 +08:00
icy
9675735073 start scrpit fix 2025-10-31 14:39:04 +08:00
icy
517d0caf6f admin_mode config 2025-10-31 14:34:53 +08:00
icy
458f5c20cc start script fix about config.json 2025-10-31 14:16:47 +08:00
icy
dd88997d8e Restore config.json.example 2025-10-31 14:09:28 +08:00
tinkle-community
5d389234c9 Merge pull request #110 from Icyoung/dev
【Dev】新增仓位模式的配置、移除config配置的文档描述
2025-10-31 13:54:19 +08:00
icy
fcf25706c1 Route fix 2025-10-31 13:49:05 +08:00
icy
904698504f Discard config settings in MD 2025-10-31 13:28:06 +08:00
icy
d0621265aa Add MarginMode configration 2025-10-31 13:14:24 +08:00
icy
24a2a83975 Fix start script 2025-10-31 12:46:16 +08:00
tinkle-community
796fb90701 Merge pull request #105 from d0lwl0b/dev
fix(config): rename config example to .jsonc and update all references
2025-10-31 12:02:40 +08:00
d0lwl0b
a3634693f3 fix(config): rename config example to .jsonc and update all references 2025-10-31 11:51:17 +08:00
tinkle-community
8f312430c2 Merge pull request #92 from Icyoung/dev
[Dev] account系统、前端配置 ,model/cex dex/trader、自定义prompt
2025-10-31 04:24:59 +08:00
tinkle
659a63c98d Merge branch 'main' into dev
Integrate latest changes from main branch including:
- Documentation updates for trader configuration
- Color system improvements for UI components
- Logo design files

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-31 04:17:10 +08:00
icy
a85d38cb59 rename fix 2025-10-31 04:07:14 +08:00
icy
3f686dec2e Merge branch 'main' of github.com:Icyoung/nofx
# Conflicts:
#	config.json.example
#	config/config.go
#	main.go
#	trader/auto_trader.go
#	web/src/App.tsx
#	web/src/components/CompetitionPage.tsx
2025-10-31 03:59:58 +08:00
icy
ac7c40632d account system、custom prompt 2025-10-31 03:42:01 +08:00
tinkle-community
23fb34c58a Merge pull request #76 from cookieY/main 2025-10-31 03:39:09 +08:00
Yinghao Fan
b6c4a7f75e fix: Correct error handling in decision parsing
Changes:
- Updated error handling in `GetFullDecision` and `parseFullDecisionResponse` functions to return the decision object even when an error occurs, improving the clarity of error messages.

This ensures that the decision object is consistently returned, allowing for better debugging and handling of errors in the decision-making process.
2025-10-31 02:06:20 +08:00