diff --git a/src/components/ftbot/BotComarisonList.vue b/src/components/ftbot/BotComarisonList.vue index d0bee272..87cfd157 100644 --- a/src/components/ftbot/BotComarisonList.vue +++ b/src/components/ftbot/BotComarisonList.vue @@ -25,6 +25,12 @@ :stake-currency="row.item.stakeCurrency" /> + @@ -58,20 +64,20 @@ export default class BotComparisonList extends Vue { stakeCurrency: 'USDT', wins: 0, losses: 0, - winVsLoss: '', }; Object.entries(this.allProfit).forEach(([k, v]) => { // TODO: handle one inactive bot ... val.push({ botId: this.allAvailableBots[k].botName, - trades: `${this.allOpenTradeCount[k]} / ${this.allBotState[k]?.max_open_trades}`, + trades: `${this.allOpenTradeCount[k]} / ${this.allBotState[k]?.max_open_trades || 'N/A'}`, profitClosed: v.profit_closed_coin, profitClosedRatio: v.profit_closed_ratio_sum || 0, stakeCurrency: this.allBotState[k]?.stake_currency || '', profitOpenRatio: v.profit_all_ratio_sum - v.profit_closed_ratio_sum, profitOpen: v.profit_all_coin - v.profit_closed_coin, - winVsLoss: `${v.winning_trades || 'N/A'} / ${v.losing_trades || 'N/A'}`, + wins: v.winning_trades, + losses: v.losing_trades, }); if (v.profit_closed_coin !== undefined) { summary.profitClosed += v.profit_closed_coin; @@ -81,7 +87,6 @@ export default class BotComparisonList extends Vue { // summary.decimals = this.allBotState[k]?.stake_currency_decimals || summary.decimals; } }); - summary.winVsLoss = `${summary.wins} / ${summary.losses}`; val.push(summary); return val; } diff --git a/src/components/general/ProfitPill.vue b/src/components/general/ProfitPill.vue index 7f7f3c34..cff0c30b 100644 --- a/src/components/general/ProfitPill.vue +++ b/src/components/general/ProfitPill.vue @@ -44,10 +44,10 @@ export default class ProfitPill extends Vue { diff --git a/src/styles/_styles_ovw.scss b/src/styles/_styles_ovw.scss index f9ddda09..25c1175e 100644 --- a/src/styles/_styles_ovw.scss +++ b/src/styles/_styles_ovw.scss @@ -4,6 +4,13 @@ background-color: #000000; } +.text-profit { + color: $color-profit; +} +.text-loss { + color: $color-loss; +} + [data-theme="dark"] { $bg-dark: #3c3c3c; $bg-darker: darken($bg-dark, 5%); diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index 0b92a231..c48582e3 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -1,2 +1,5 @@ // variables created for the project and not overwrite of bootstrap $fontsize-small: 0.9rem; + +$color-profit: #12bb7b; +$color-loss: #ef5350; diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index 45eacfe1..8aafabc5 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -33,8 +33,8 @@ - {{ profit.winning_trades }} / - {{ profit.losing_trades }} + {{ profit.winning_trades }} / + {{ profit.losing_trades }}