From 46c984fcfd5071487f8076508df2e68e5f2aa995 Mon Sep 17 00:00:00 2001
From: Mike van Rossum <mike@mikevanrossum.nl>
Date: Sat, 30 Jun 2018 00:33:53 +0700
Subject: [PATCH] update live gekko to 0.6 events

---
 web/vue/public/favicon.ico                    | Bin 1150 -> 0 bytes
 .../backtester/result/roundtripTable.vue      |   2 +-
 web/vue/src/components/gekko/list.vue         |  10 +-
 web/vue/src/components/gekko/new.vue          |   8 +-
 ...{singleStratrunner.vue => singleGekko.vue} | 164 +++++++++++-------
 web/vue/src/main.js                           |   6 +-
 6 files changed, 110 insertions(+), 80 deletions(-)
 delete mode 100644 web/vue/public/favicon.ico
 rename web/vue/src/components/gekko/{singleStratrunner.vue => singleGekko.vue} (51%)

diff --git a/web/vue/public/favicon.ico b/web/vue/public/favicon.ico
deleted file mode 100644
index c7b9a43c8cd16d0b434adaf513fcacb340809a11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmchVOGsN$5QZm2NTI$erQpKHrdQX(jn+pVxKN`Ng)RzW5+8_2Xb@Y)Dkd6tq9V8u
z3WAh^C@KZ1kA;tohzs}b3NC_*QmUXr$oP*rH(2mdT{z*(KX=aj=bX$9kqMvFRKj;Q
zwI&d~A);J>5-PDega~WT5us%#Dc(Y}C4WpP?+fS;FaZ*z_CFzgiW=w{I02=q_TUz(
z?=^H2uwoIK1n%|Ay21~QgjV1emYtWttJdz^L#=DjJ@Ex*9UPc*7<=rZo*_NAh4PxA
zqkso~Ioa1y$e+3kIkXi29YNLi&lW}vY6C}ut4{8ou(7w=$_=$v{yJ$h?y!&bJfq*(
zL_NQRF37$6e>%9erGV?p^lRFD?|5J_eupXaS;QluyrOmBT>PJhirMYb*<GPW1y7aE
zons}&9sZ*4{SBXZ)4`5-`(_;6T$j)8a`;{PI@prD#aqC^`S>i?(4Tf=j~?VvnUlY_
zDCVuuk3E&T9aP~Cr-0i-MaKUjf_|U!=R&t}_CfD=d${p~HH`BPaqb9aXT}UI$iGRg
z>0^GlZ`vM4?;$*LhfI(RG|XK4GF+@-W*W}YJT5&2N_ZyZuaM_Ry=%PWx>r0P(Rc?>
jRc4}SfGA>*agjwN{7E7DEm(*)%rSx{B0<6wBoglxJAy|R

diff --git a/web/vue/src/components/backtester/result/roundtripTable.vue b/web/vue/src/components/backtester/result/roundtripTable.vue
index ece286adb..81268d5a3 100644
--- a/web/vue/src/components/backtester/result/roundtripTable.vue
+++ b/web/vue/src/components/backtester/result/roundtripTable.vue
@@ -36,7 +36,7 @@ export default {
   methods: {
     diff: n => moment.duration(n).humanize(),
     humanizeDuration: (n) => window.humanizeDuration(n),
-    fmt: mom => moment.unix(mom).utc().format('YYYY-MM-DD HH:mm'),
+    fmt: mom => moment(mom).utc().format('YYYY-MM-DD HH:mm'),
     round: n => (+n).toFixed(3),
   },
 }
diff --git a/web/vue/src/components/gekko/list.vue b/web/vue/src/components/gekko/list.vue
index f16262f99..bd09e28bd 100644
--- a/web/vue/src/components/gekko/list.vue
+++ b/web/vue/src/components/gekko/list.vue
@@ -15,7 +15,7 @@
           th last update
           th duration
       tbody
-        tr.clickable(v-for='gekko in watchers', v-on:click='$router.push({path: `live-gekkos/watcher/${gekko.id}`})')
+        tr.clickable(v-for='gekko in watchers', v-on:click='$router.push({path: `live-gekkos/${gekko.id}`})')
           td {{ gekko.config.watch.exchange }}
           td {{ gekko.config.watch.currency }}
           td {{ gekko.config.watch.asset }}
@@ -41,7 +41,7 @@
           th type
           th trades
       tbody
-        tr.clickable(v-for='gekko in stratrunners', v-on:click='$router.push({path: `live-gekkos/stratrunner/${gekko.id}`})')
+        tr.clickable(v-for='gekko in stratrunners', v-on:click='$router.push({path: `live-gekkos/${gekko.id}`})')
           td {{ gekko.config.watch.exchange }}
           td {{ gekko.config.watch.currency }}
           td {{ gekko.config.watch.asset }}
@@ -53,10 +53,10 @@
           td
             template(v-if='!gekko.report') 0
             template(v-if='gekko.report') {{ round(gekko.report.profit) }} {{ gekko.watch.currency }}
+          td {{ gekko.logType }}
           td
-            template(v-if='gekko.trader') {{ gekko.trader }}
-          td
-            template(v-if='gekko.trades') {{ gekko.trades.length }}
+            template(v-if='!gekko.events.trades') 0
+            template(v-if='gekko.events.trades') {{ gekko.events.trades.length }}
     .hr
     h2 Start a new live Gekko
     router-link.btn--primary(to='/live-gekkos/new') Start a new live Gekko!
diff --git a/web/vue/src/components/gekko/new.vue b/web/vue/src/components/gekko/new.vue
index 544db89c0..32311955f 100644
--- a/web/vue/src/components/gekko/new.vue
+++ b/web/vue/src/components/gekko/new.vue
@@ -4,7 +4,7 @@
     gekko-config-builder(v-on:config='updateConfig')
     .hr
     .txt--center(v-if='config.valid')
-      a.w100--s.my1.btn--primary(href='#', v-on:click.prevent='start') Start
+      a.w100--s.my1.btn--primary(href='#', v-on:click.prevent='start', v-if="!pendingStratrunner") Start
 </template>
 
 <script>
@@ -98,14 +98,12 @@ export default {
 
       const gekko = this.existingMarketWatcher;
 
-      console.log('watching...', gekko);
-
       if(gekko.events.latest.candle) {
         this.pendingStratrunner = false;
 
         this.startGekko((err, resp) => {
           this.$router.push({
-            path: `/live-gekkos/stratrunner/${resp.id}`
+            path: `/live-gekkos/${resp.id}`
           });
         });
       }
@@ -176,7 +174,7 @@ export default {
         return console.error(err, resp.error);
 
       this.$router.push({
-        path: `/live-gekkos/stratrunner/${resp.id}`
+        path: `/live-gekkos/${resp.id}`
       });
     },
     startWatcher: function(next) {
diff --git a/web/vue/src/components/gekko/singleStratrunner.vue b/web/vue/src/components/gekko/singleGekko.vue
similarity index 51%
rename from web/vue/src/components/gekko/singleStratrunner.vue
rename to web/vue/src/components/gekko/singleGekko.vue
index bae1f9f51..f44ce4ee7 100644
--- a/web/vue/src/components/gekko/singleStratrunner.vue
+++ b/web/vue/src/components/gekko/singleGekko.vue
@@ -1,49 +1,50 @@
 <template lang='pug'>
   div.my2
     .contain(v-if='!data')
-      h1 Unknown Strat runner
-      p Gekko doesn't know what strat runner this is...
+      h1 Unknown Gekko instance
+      p Gekko doesn't know what gekko this is...
     div(v-if='data')
-      h2.contain Strat runner
+      h2.contain Gekko {{ type }}
       .grd.contain
         .grd-row
           .grd-row-col-3-6
             h3 Market
             .grd-row
               .grd-row-col-3-6 Exchange
-              .grd-row-col-3-6 {{ data.watch.exchange }}
+              .grd-row-col-3-6 {{ config.watch.exchange }}
             .grd-row
               .grd-row-col-3-6 Currency
-              .grd-row-col-3-6 {{ data.watch.currency }}
+              .grd-row-col-3-6 {{ config.watch.currency }}
             .grd-row
               .grd-row-col-3-6 Asset
-              .grd-row-col-3-6 {{ data.watch.asset }}
+              .grd-row-col-3-6 {{ config.watch.asset }}
             .grd-row
               .grd-row-col-3-6 Type
-              .grd-row-col-3-6 {{ data.trader }}
+              .grd-row-col-3-6 {{ type }}
           .grd-row-col-3-6
             h3 Runtime
             spinner(v-if='isLoading')
             template(v-if='!isLoading')
-              .grd-row(v-if='data.firstCandle')
+              .grd-row(v-if='initialEvents.candle')
                 .grd-row-col-2-6 Watching since
-                .grd-row-col-4-6 {{ fmt(data.firstCandle.start) }}
-              .grd-row(v-if='data.lastCandle')
+                .grd-row-col-4-6 {{ fmt(initialEvents.candle.start) }}
+              .grd-row(v-if='latestEvents.candle')
                 .grd-row-col-2-6 Received data until
-                .grd-row-col-4-6 {{ fmt(data.lastCandle.start) }}
-              .grd-row(v-if='data.lastCandle && data.firstCandle')
+                .grd-row-col-4-6 {{ fmt(latestEvents.candle.start) }}
+              .grd-row(v-if='latestEvents.candle')
                 .grd-row-col-2-6 Data spanning
-                .grd-row-col-4-6 {{ humanizeDuration(moment(data.lastCandle.start).diff(moment(data.firstCandle.start))) }}
-              .grd-row(v-if='data.lastCandle && data.firstCandle')
-                .grd-row-col-2-6 Amount of trades
-                .grd-row-col-4-6 {{ data.trades.length }}
-              .grd-row(v-if='data.strat && data.strat.tradingAdvisor && data.strat.tradingAdvisor.candleSize')
-                .grd-row-col-2-6 Candle size
-                .grd-row-col-4-6 {{ data.strat.tradingAdvisor.candleSize }}
-              .grd-row(v-if='data.strat && data.strat.tradingAdvisor && data.strat.tradingAdvisor.historySize')
-                .grd-row-col-2-6 History size
-                .grd-row-col-4-6 {{ data.strat.tradingAdvisor.historySize }}
-        .grd-row
+                .grd-row-col-4-6 {{ humanizeDuration(moment(latestEvents.candle.start).diff(moment(initialEvents.candle.start))) }}
+              template(v-if='isStratrunner')
+                .grd-row
+                  .grd-row-col-2-6 Amount of trades
+                  .grd-row-col-4-6 {{ trades.length }}
+                .grd-row
+                  .grd-row-col-2-6 Candle size
+                  .grd-row-col-4-6 {{ config.tradingAdvisor.candleSize }}
+                .grd-row
+                  .grd-row-col-2-6 History size
+                  .grd-row-col-4-6 {{ config.tradingAdvisor.historySize }}
+        .grd-row(v-if='isStratrunner')
           .grd-row-col-3-6
             h3 Strategy
             .grd-row
@@ -66,24 +67,23 @@
                 .grd-row-col-3-6 {{ round(report.balance) }}
               .grd-row
                 .grd-row-col-3-6 Market
-                .grd-row-col-3-6 {{round(report.market / 100 * report.startPrice)}} {{ data.watch.currency }} ({{ round(report.market) }} %)
+                .grd-row-col-3-6 {{round(report.market / 100 * report.startPrice)}} {{ config.watch.currency }} ({{ round(report.market) }} %)
               .grd-row
                 .grd-row-col-3-6 Profit
-                .grd-row-col-3-6 {{ round(report.profit) }} {{ data.watch.currency }} ({{ round(report.relativeProfit) }} %)
+                .grd-row-col-3-6 {{ round(report.profit) }} {{ config.watch.currency }} ({{ round(report.relativeProfit) }} %)
               .grd-row
                 .grd-row-col-3-6 Alpha
-                .grd-row-col-3-6 {{ round(report.alpha) }} {{ data.watch.currency }}
-        p(v-if='watcher')
-          em This strat runner gets data from
-            router-link(:to='"/live-gekkos/watcher/" + watcher.id') this market watcher
+                .grd-row-col-3-6 {{ round(report.alpha) }} {{ config.watch.currency }}
+        p(v-if='isStratrunner')
+          em This gekko gets market data from 
+            router-link(:to='"/live-gekkos/" + watcher.id') this market watcher
           | .
       template(v-if='!isLoading')
         h3.contain Market graph
         spinner(v-if='candleFetch === "fetching"')
         template(v-if='candleFetch === "fetched"')
           chart(:data='chartData', :height='300')
-        roundtrips(:roundtrips='data.roundtrips')
-
+        roundtrips(v-if='isStratrunner', :roundtrips='roundtrips')
 </template>
 
 <script>
@@ -116,11 +116,45 @@ export default {
     }
   },
   computed: {
-    stratrunners: function() {
-      return this.$store.state.stratrunners;
+    id: function() {
+      return this.$route.params.id;
+    },
+    gekkos: function() {
+      return this.$store.state.gekkos;
     },
     data: function() {
-      return _.find(this.stratrunners, {id: this.$route.params.id});
+      if(!this.gekkos)
+        return false;
+      if(_.has(this.gekkos, this.id))
+        return this.gekkos[this.id];
+      if(_.has(this.finishedGekkos, this.id))
+        return this.finishedGekkos[this.id];
+
+      return false;
+    },
+    config: function() {
+      return _.get(this, 'data.config');
+    },
+    latestEvents: function() {
+      return _.get(this, 'data.events.latest');
+    },
+    initialEvents: function() {
+      return _.get(this, 'data.events.initial');
+    },
+    trades: function() {
+      return _.get(this, 'data.events.trades') || [];
+    },
+    roundtrips: function() {
+      return _.get(this, 'data.events.roundtrip') || [];
+    },
+    isLive: function() {
+      return _.has(this.gekkos, this.id);
+    },
+    type: function() {
+      return this.data.logType;
+    },
+    isStratrunner: function() {
+      return this.type !== 'watcher';
     },
     chartData: function() {
       return {
@@ -128,27 +162,18 @@ export default {
         trades: this.trades
       }
     },
-    trades: function() {
-      if(!this.data)
-        return [];
-
-      return this.data.trades;
-    },
     report: function() {
-      if(!this.data)
-        return;
-
-      return this.data.report;
+      return _.get(this.latestEvents, 'performanceReport');
     },
     stratName: function() {
       if(this.data)
-        return this.data.strat.tradingAdvisor.method;
+        return this.data.config.tradingAdvisor.method;
     },
     stratParams: function() {
       if(!this.data)
-        return '';
+        return 'Loading...';
 
-      let stratParams = Vue.util.extend({}, this.data.strat.params);
+      let stratParams = Vue.util.extend({}, this.data.config[this.stratName]);
       delete stratParams.__empty;
 
       if(_.isEmpty(stratParams))
@@ -159,23 +184,29 @@ export default {
     isLoading: function() {
       if(!this.data)
         return true;
-      if(!_.isObject(this.data.firstCandle))
+      if(!_.get(this.data, 'events.initial.candle'))
         return true;
-      if(!_.isObject(this.data.lastCandle))
+      if(!_.get(this.data, 'events.latest.candle'))
         return true;
 
       return false;
     },
-    watchers: function() {
-      return this.$store.state.watchers;
-    },
     watcher: function() {
-      let watch = Vue.util.extend({}, this.data.watch);
-      return _.find(this.watchers, { watch });
+      if(!this.isStratrunner) {
+        return false;
+      }
+
+      let watch = Vue.util.extend({}, this.data.config.watch);
+      return _.find(this.gekkos, g => {
+        if(g.id === this.id)
+          return false;
+
+        return _.isEqual(watch, g.config.watch);
+      });
     },
   },
   watch: {
-    'data.lastCandle.start': function() {
+    'data.events.latest.candle.start': function() {
       this.candleFetch = 'dirty';
     },
     data: function(val, prev) {
@@ -194,18 +225,21 @@ export default {
     getCandles: function() {
       this.candleFetch = 'fetching';
 
-      let to = this.data.lastCandle.start;
-      let from = this.data.firstCandle.start;
-      let candleSize = this.data.strat.tradingAdvisor.candleSize;
+      let to = this.data.events.latest.candle.start;
+      let from = this.data.events.initial.candle.start;
+      let candleSize = 1;
+
+      if(this.type !== 'watcher') {
+        candleSize = this.data.config.tradingAdvisor.candleSize;
+      }
 
       let config = {
-          watch: this.data.watch,
-          daterange: {
-            to, from
-          },
-          // hourly candles
-          candleSize
-        };
+        watch: this.data.config.watch,
+        daterange: {
+          to, from
+        },
+        candleSize
+      };
 
       post('getCandles', config, (err, res) => {
         this.candleFetch = 'fetched';
diff --git a/web/vue/src/main.js b/web/vue/src/main.js
index e1e767b6e..5a41c1cc1 100644
--- a/web/vue/src/main.js
+++ b/web/vue/src/main.js
@@ -16,8 +16,7 @@ import config from './components/config/config.vue'
 
 import gekkoList from './components/gekko/list.vue'
 import newGekko from './components/gekko/new.vue'
-import singleStratrunner from './components/gekko/singleStratrunner.vue'
-import singleWatcher from './components/gekko/singleWatcher.vue'
+import singleGekko from './components/gekko/singleGekko.vue'
 import { connect as connectWS } from './components/global/ws'
 
 const router = new VueRouter({
@@ -33,8 +32,7 @@ const router = new VueRouter({
     { path: '/data/importer/import/:id', component: singleImport },
     { path: '/live-gekkos', component: gekkoList },
     { path: '/live-gekkos/new', component: newGekko },
-    { path: '/live-gekkos/stratrunner/:id', component: singleStratrunner },
-    { path: '/live-gekkos/watcher/:id', component: singleWatcher }
+    { path: '/live-gekkos/:id', component: singleGekko },
   ]
 });