From f433601a07bfecc8a49755b097f6d2c466fabfbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20S=C3=B8rensen?= Date: Tue, 12 Jan 2021 13:59:00 +0100 Subject: [PATCH 1/6] Fix default layout --- src/store/modules/layout.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/store/modules/layout.ts b/src/store/modules/layout.ts index 4cac1796..882ab645 100644 --- a/src/store/modules/layout.ts +++ b/src/store/modules/layout.ts @@ -34,16 +34,15 @@ export enum LayoutMutations { setDashboardLayout = 'setDashboardLayout', setTradingLayout = 'setTradingLayout', } - // Define default layouts const DEFAULT_TRADING_LAYOUT: GridItemData[] = [ - { i: TradeLayout.botControls, x: 0, y: 0, w: 3, h: 3 }, - { i: TradeLayout.multiPane, x: 0, y: 3, w: 3, h: 7 }, - { i: TradeLayout.chartView, x: 3, y: 0, w: 9, h: 11 }, - { i: TradeLayout.tradeDetail, x: 0, y: 11, w: 5, h: 6 }, - { i: TradeLayout.openTrades, x: 5, y: 11, w: 7, h: 5 }, - { i: TradeLayout.tradeHistory, x: 5, y: 12, w: 7, h: 6 }, - { i: TradeLayout.logView, x: 0, y: 16, w: 12, h: 3 }, + { i: TradeLayout.botControls, x: 0, y: 0, w: 4, h: 3 }, + { i: TradeLayout.multiPane, x: 0, y: 3, w: 4, h: 23 }, + { i: TradeLayout.chartView, x: 4, y: 0, w: 8, h: 11 }, + { i: TradeLayout.tradeDetail, x: 0, y: 44, w: 5, h: 6 }, + { i: TradeLayout.openTrades, x: 4, y: 11, w: 8, h: 5 }, + { i: TradeLayout.tradeHistory, x: 4, y: 16, w: 8, h: 10 }, + { i: TradeLayout.logView, x: 0, y: 26, w: 12, h: 15 }, ]; const DEFAULT_DASHBOARD_LAYOUT: GridItemData[] = [ From 2d9d14f9a9689b1a6ccffd21c3fb763d5abcff9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20S=C3=B8rensen?= Date: Tue, 12 Jan 2021 14:33:54 +0100 Subject: [PATCH 2/6] Don't include package lock --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a0dddc6f..824255d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store node_modules +package-lock.json /dist # local env files From 0e11b30039a7064451078d0c8bc76e45e4fcd5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20S=C3=B8rensen?= Date: Thu, 28 Jan 2021 17:07:24 +0100 Subject: [PATCH 3/6] Add close reason to trades list --- src/components/ftbot/TradeList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ftbot/TradeList.vue b/src/components/ftbot/TradeList.vue index ff654da0..b4bff7db 100644 --- a/src/components/ftbot/TradeList.vue +++ b/src/components/ftbot/TradeList.vue @@ -114,7 +114,7 @@ export default class TradeList extends Vue { openFields: Record[] = [{ key: 'actions' }]; // Added to table-fields for historic trades - closedFields: Record[] = [{ key: 'close_date', label: 'Close date' }]; + closedFields: Record[] = [{ key: 'close_date', label: 'Close date' },{key: 'sell_reason', label: 'Close Reason'}]; tableFields: Record[] = [ { key: 'trade_id', label: 'ID' }, From 670f1a6b733776f9ae062286b1aa068c2b02bf9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20S=C3=B8rensen?= Date: Thu, 28 Jan 2021 17:22:28 +0100 Subject: [PATCH 4/6] New default layout in trading tab --- src/store/modules/layout.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/store/modules/layout.ts b/src/store/modules/layout.ts index 882ab645..1d64943c 100644 --- a/src/store/modules/layout.ts +++ b/src/store/modules/layout.ts @@ -39,10 +39,10 @@ const DEFAULT_TRADING_LAYOUT: GridItemData[] = [ { i: TradeLayout.botControls, x: 0, y: 0, w: 4, h: 3 }, { i: TradeLayout.multiPane, x: 0, y: 3, w: 4, h: 23 }, { i: TradeLayout.chartView, x: 4, y: 0, w: 8, h: 11 }, - { i: TradeLayout.tradeDetail, x: 0, y: 44, w: 5, h: 6 }, + { i: TradeLayout.tradeDetail, x: 4, y: 16, w: 8, h: 5 }, { i: TradeLayout.openTrades, x: 4, y: 11, w: 8, h: 5 }, - { i: TradeLayout.tradeHistory, x: 4, y: 16, w: 8, h: 10 }, - { i: TradeLayout.logView, x: 0, y: 26, w: 12, h: 15 }, + { i: TradeLayout.tradeHistory, x: 4, y: 21, w: 8, h: 10 }, + { i: TradeLayout.logView, x: 0, y: 31, w: 12, h: 13 }, ]; const DEFAULT_DASHBOARD_LAYOUT: GridItemData[] = [ From 8f2ef8f0412a4275fdb9abc3afbec1d62c928a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20S=C3=B8rensen?= Date: Thu, 28 Jan 2021 17:28:20 +0100 Subject: [PATCH 5/6] Stupid me converted layout data the wrong way... --- src/store/modules/layout.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/layout.ts b/src/store/modules/layout.ts index 1d64943c..3d676899 100644 --- a/src/store/modules/layout.ts +++ b/src/store/modules/layout.ts @@ -37,7 +37,7 @@ export enum LayoutMutations { // Define default layouts const DEFAULT_TRADING_LAYOUT: GridItemData[] = [ { i: TradeLayout.botControls, x: 0, y: 0, w: 4, h: 3 }, - { i: TradeLayout.multiPane, x: 0, y: 3, w: 4, h: 23 }, + { i: TradeLayout.multiPane, x: 0, y: 3, w: 4, h: 28 }, { i: TradeLayout.chartView, x: 4, y: 0, w: 8, h: 11 }, { i: TradeLayout.tradeDetail, x: 4, y: 16, w: 8, h: 5 }, { i: TradeLayout.openTrades, x: 4, y: 11, w: 8, h: 5 }, From e7fbb5d43a57f3864dfba4431395610815f5e8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20S=C3=B8rensen?= Date: Thu, 4 Feb 2021 15:13:53 +0100 Subject: [PATCH 6/6] Make sidebar narrower, and details taller --- src/store/modules/layout.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/store/modules/layout.ts b/src/store/modules/layout.ts index 3d676899..72e3f659 100644 --- a/src/store/modules/layout.ts +++ b/src/store/modules/layout.ts @@ -36,13 +36,13 @@ export enum LayoutMutations { } // Define default layouts const DEFAULT_TRADING_LAYOUT: GridItemData[] = [ - { i: TradeLayout.botControls, x: 0, y: 0, w: 4, h: 3 }, - { i: TradeLayout.multiPane, x: 0, y: 3, w: 4, h: 28 }, - { i: TradeLayout.chartView, x: 4, y: 0, w: 8, h: 11 }, - { i: TradeLayout.tradeDetail, x: 4, y: 16, w: 8, h: 5 }, - { i: TradeLayout.openTrades, x: 4, y: 11, w: 8, h: 5 }, - { i: TradeLayout.tradeHistory, x: 4, y: 21, w: 8, h: 10 }, - { i: TradeLayout.logView, x: 0, y: 31, w: 12, h: 13 }, + { i: TradeLayout.botControls, x: 0, y: 0, w: 3, h: 3 }, + { i: TradeLayout.multiPane, x: 0, y: 3, w: 3, h: 32 }, + { i: TradeLayout.chartView, x: 3, y: 0, w: 9, h: 14 }, + { i: TradeLayout.tradeDetail, x: 3, y: 19, w: 9, h: 6 }, + { i: TradeLayout.openTrades, x: 3, y: 14, w: 9, h: 5 }, + { i: TradeLayout.tradeHistory, x: 3, y: 25, w: 9, h: 10 }, + { i: TradeLayout.logView, x: 0, y: 35, w: 12, h: 13 }, ]; const DEFAULT_DASHBOARD_LAYOUT: GridItemData[] = [