From 5c0f575f3d792e760ac510d571364cea5bc3918a Mon Sep 17 00:00:00 2001
From: Simon Archieri <simon.archieri@gmail.com>
Date: Fri, 8 Feb 2019 16:09:38 +0100
Subject: [PATCH 1/3] Remove json.stringify before making post request cause
 it's disturb flask

---
 src/components/ImportCampaign.vue             |   6 +-
 src/components/Spark.vue                      |   1 -
 .../pathDetails/PathDetailsViewer.vue.orig    | 144 ------------------
 3 files changed, 3 insertions(+), 148 deletions(-)
 delete mode 100644 src/components/pathDetails/PathDetailsViewer.vue.orig

diff --git a/src/components/ImportCampaign.vue b/src/components/ImportCampaign.vue
index b7c10ea..b7805ca 100644
--- a/src/components/ImportCampaign.vue
+++ b/src/components/ImportCampaign.vue
@@ -120,21 +120,21 @@ export default {
     showLog () {
       var args = '{}'
       if (this.$refs.logFile.$refs.input.value !== '') {
-        args = JSON.stringify({'logFile': this.$refs.logFile.$refs.input.value})
+        args = {'logFile': this.$refs.logFile.$refs.input.value}
       }
       ApiManager.postImportLog(args).then(answer => {
         this.log = answer.data.answer
       })
     },
     launch () {
-      var args = JSON.stringify({
+      var args = {
         'path': this.$refs.campaignDir.$refs.input.value,
         'id_malette': this.$refs.idMalette.$refs.input.value,
         'id_rederbro': this.$refs.idRederbro.$refs.input.value,
         'camera_number': this.$refs.cameraNB.$refs.input.value,
         'description': this.$refs.description.$refs.input.value,
         'campaign_name': this.$refs.campaignName.$refs.input.value
-      })
+      }
 
       ApiManager.postImportLaunch(args).then(answer => {
         this.scan()
diff --git a/src/components/Spark.vue b/src/components/Spark.vue
index e240ddb..a557193 100644
--- a/src/components/Spark.vue
+++ b/src/components/Spark.vue
@@ -123,7 +123,6 @@ export default {
       if (this.$refs.customLaunchScript.$refs.input.value !== '') {
         args.customLaunchScript = this.$refs.customLaunchScript.$refs.input.value
       }
-      args = JSON.stringify(args)
       ApiManager.postSparkLaunch(args).then(answer => {
         this.answer = answer.data.answer
         this.startScan()
diff --git a/src/components/pathDetails/PathDetailsViewer.vue.orig b/src/components/pathDetails/PathDetailsViewer.vue.orig
deleted file mode 100644
index 1c5cd5a..0000000
--- a/src/components/pathDetails/PathDetailsViewer.vue.orig
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-  <v-app>
-    <v-container fluid fill-height>
-      <v-layout align-center justify-center>
-        <v-flex>
-          <v-card class="elevation-12">
-            <v-toolbar dark color="primary">
-              <v-toolbar-title>Path details viewer: {{id_campaign}}-{{id_malette}}</v-toolbar-title>
-              <v-spacer></v-spacer>
-              <Menu></Menu>
-            </v-toolbar>
-            <v-card-text>
-              <v-data-table :headers="headers" :items="pathDetails" hide-actions item-key="id_path_details">
-                <template slot="items" slot-scope="props">
-                  <tr @click="props.expanded = !props.expanded">
-                    <td>{{props.item.name}}</td>
-                    <td>{{props.item.decription}}</td>
-                    <td>{{props.item.id_path_details}}</td>
-                    <td>{{props.item.id_malette}}</td>
-                    <td v-if="props.item.id_path_details in pathNodes">{{pathNodes[props.item.id_path_details].length}}</td>
-                    <td v-else><v-progress-circular indeterminate color="primary"></v-progress-circular></td>
-                  </tr>
-                </template>
-                <template slot="expand" slot-scope="props">
-                  <v-card flat>
-                    <v-card-actions>
-                      <v-spacer></v-spacer>
-                      <router-link :to="{ name: 'PathDetailsEditor', params: { id_path_details: props.item.id_path_details, id_malette: props.item.id_malette}}">
-                        <v-btn color="primary">Editor</v-btn>
-                      </router-link>
-                      <v-spacer></v-spacer>
-                    </v-card-actions>
-                  </v-card>
-                </template>
-              </v-data-table>
-            </v-card-text>
-            <v-card-actions>
-              <v-spacer></v-spacer>
-              <v-dialog v-model="dialog">
-                <v-btn slot="activator" dark color="primary">New</v-btn>
-                <v-card>
-                  <v-toolbar color="primary" dark>
-                    <v-toolbar-title>New path details for campaign {{id_campaign}}/{{id_malette}}</v-toolbar-title>
-                  </v-toolbar>
-                  <v-card-text>
-                    <v-text-field label="Name" ref="name"></v-text-field>
-                    <v-textarea label="Description" ref="description"></v-textarea>
-                  </v-card-text>
-                  <v-card-actions>
-                    <v-spacer></v-spacer>
-                    <v-btn color="primary" dark @click="createPathDetail">Create</v-btn>
-                  </v-card-actions>
-                </v-card>
-              </v-dialog>
-            </v-card-actions>
-          </v-card>
-        </v-flex>
-      </v-layout>
-    </v-container>
-  </v-app>
-</template>
-
-<script>
-import Menu from '@/components/Menu'
-import apiManager from '@/apiManager'
-
-export default {
-  name: 'PathDetailsViewer',
-  props: ['id_campaign', 'id_malette'],
-  components: {
-    Menu
-  },
-  data () {
-    return {
-      pathDetails: [],
-      pathNodes: {},
-      headers: [
-        {text: 'Name', value: 'name', align: 'left', sortable: false},
-        {text: 'Description', value: 'description', sortable: false},
-        {text: 'ID', value: 'id_path_details'},
-        {text: 'ID Malette', value: 'id_malette'},
-        {text: 'Number path node', value: 'number'}
-      ],
-      dialog: false
-    }
-  },
-  created () {
-<<<<<<< HEAD
-    this.loadData()
-=======
-    this.loadPathDetails();
->>>>>>> master
-  },
-  methods: {
-    async loadPathDetails () {
-      if (this.id_campaign !== null && this.id_malette !== null) {
-        await apiManager.getPathDetailFromCampaign(this.id_campaign)
-          .then((pathDetails) => {
-            this.pathDetails = pathDetails.data.objects
-            for (let pathDetail in this.pathDetails) {
-              this.getPathNode(this.pathDetails[pathDetail])
-            }
-          })
-      }
-    },
-    getPathNode (pathDetail) {
-      apiManager.getPathNodeFromPathDetails(pathDetail.id_path_details)
-        .then((pathNode) => {
-          this.$set(this.pathNodes, pathDetail.id_path_details, pathNode.data.objects)
-        })
-    },
-    async createPathDetail () {
-      await apiManager.postPathDetails({
-        campaign: {
-          id_campaign: this.id_campaign,
-          id_malette: this.id_malette
-        },
-        name: this.$refs.name.$refs.input.value,
-        decription: this.$refs.description.$refs.input.value
-      })
-<<<<<<< HEAD
-        .then(() => {
-          this.loadData()
-          this.dialog = false
-        })
-    },
-    loadData () {
-      if (this.id_campaign !== null && this.id_malette !== null) {
-        apiManager.getPathDetailFromCampaign(this.id_campaign)
-          .then((pathDetails) => {
-            this.pathDetails = pathDetails.data.objects
-            for (let pathDetail in this.pathDetails) {
-              this.getPathNode(this.pathDetails[pathDetail])
-            }
-          })
-      }
-=======
-      await this.loadPathDetails()
-      this.dialog = false
->>>>>>> master
-    }
-  }
-}
-</script>

From 1895ffb0f64cc3f4b1c19d51058e11cf6f4ce0ad Mon Sep 17 00:00:00 2001
From: Simon Archieri <simon.archieri@gmail.com>
Date: Fri, 8 Feb 2019 16:10:51 +0100
Subject: [PATCH 2/3] Remove debugger line that cause trouble in dev (not in
 production)

---
 src/components/pathDetails/Parameter.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/pathDetails/Parameter.vue b/src/components/pathDetails/Parameter.vue
index 86cab4f..7c76574 100644
--- a/src/components/pathDetails/Parameter.vue
+++ b/src/components/pathDetails/Parameter.vue
@@ -52,16 +52,16 @@ export default {
       delete this.$parent.$parent.$parent.pathDetails.id_path_details
       delete this.$parent.$parent.$parent.pathDetails.id_malette
       this.$parent.$parent.$parent.pathDetails.name = this.$refs.newName.$refs.input.value
-      debugger
+      //debugger
       apiManager.postPathDetails(this.$parent.$parent.$parent.pathDetails)
         .then((pathDetails) => {
-          debugger
+          //debugger
           this.$parent.$parent.$parent.pathDetails = pathDetails.data
           this.$parent.$parent.$parent.save(false)
         })
     },
     deleteAll () {
-      debugger
+      //debugger
       this.$parent.$parent.$parent.deleteOldOne(this.$parent.$parent.$parent.pathNode)
         .then(this.$parent.$parent.$parent.loadData)
     },

From 4bb9be1256903860e72e7e26ad52cebed8f0f258 Mon Sep 17 00:00:00 2001
From: Simon Archieri <simon.archieri@gmail.com>
Date: Fri, 8 Feb 2019 16:36:26 +0100
Subject: [PATCH 3/3] Add celery tab

---
 src/apiManager.js                        |  3 +
 src/components/CampaignList.vue          |  5 +-
 src/components/Celery.vue                | 86 ++++++++++++++++++++++++
 src/components/Menu.vue                  |  1 +
 src/components/pathDetails/Parameter.vue |  6 +-
 src/config.json                          |  3 +-
 src/router/index.js                      | 13 ++++
 7 files changed, 112 insertions(+), 5 deletions(-)
 create mode 100644 src/components/Celery.vue

diff --git a/src/apiManager.js b/src/apiManager.js
index 30f75f2..cb94902 100644
--- a/src/apiManager.js
+++ b/src/apiManager.js
@@ -50,6 +50,9 @@ export default class ApiManager {
   static postSparkLaunch (args) {
     return axios.post(opvSt + 'spark/launch', args)
   }
+  static postCeleryLaunch (args) {
+    return axios.post(opvSt + 'celery/launch', args)
+  }
   static getSparkPort () {
     return axios.get(opvSt + 'spark/port')
   }
diff --git a/src/components/CampaignList.vue b/src/components/CampaignList.vue
index 4278375..1aecaff 100644
--- a/src/components/CampaignList.vue
+++ b/src/components/CampaignList.vue
@@ -27,7 +27,10 @@
                         <v-btn color="primary">Global campaign view</v-btn>
                       </router-link>
                       <router-link class="mr-1" :to="{ name: 'SparkValue', params: { id_campaign: props.item.id_campaign, id_malette: props.item.id_malette}}">
-                        <v-btn color="primary">Stitch it</v-btn>
+                        <v-btn color="primary">Spark</v-btn>
+                      </router-link>
+                      <router-link class="mr-1" :to="{ name: 'CeleryValue', params: { id_campaign: props.item.id_campaign, id_malette: props.item.id_malette}}">
+                        <v-btn color="primary">Celery</v-btn>
                       </router-link>
                       <router-link class="mr-1" :to="{ name: 'PanoramaSelector', params: { id_campaign: props.item.id_campaign, id_malette: props.item.id_malette}}">
                         <v-btn color="primary">Panorama selection</v-btn>
diff --git a/src/components/Celery.vue b/src/components/Celery.vue
new file mode 100644
index 0000000..d5d5fee
--- /dev/null
+++ b/src/components/Celery.vue
@@ -0,0 +1,86 @@
+<template>
+  <v-app>
+    <v-container fluid fill-height>
+      <v-layout align-center justify-center>
+        <v-flex xs7>
+          <v-card class="elevation-12">
+            <v-toolbar dark color="primary">
+              <v-toolbar-title>Celery</v-toolbar-title>
+              <v-spacer></v-spacer>
+              <Menu :where="'Celery'"></Menu>
+            </v-toolbar>
+            <v-card-text>
+              <v-container fluid grid-list-sm>
+                <v-layout row wrap>
+                  <v-flex>
+                    <v-card>
+                      <v-card-text>
+                        <v-text-field ref='campaignId' label='Campaign id' :value="id_campaign"></v-text-field>
+                        <v-text-field ref='maletteId' label='Malette id' :value="id_malette"></v-text-field>
+                      </v-card-text>
+                    </v-card>
+                  </v-flex>
+                  <v-flex>
+                    <v-card>
+                      <v-card-text>
+                        <v-btn @click="launchCelery()" color="primary">Launch celery</v-btn>
+                      </v-card-text>
+                    </v-card>
+                    <v-card class="mt-1">
+                      <v-card-text>
+                        <v-list>
+                          <v-list-tile>
+                            <v-list-tile-content>Answer:</v-list-tile-content>
+                            <v-list-tile-content class="align-end">{{answer}}</v-list-tile-content>
+                          </v-list-tile>
+                          <v-divider></v-divider>
+                          <v-list-tile>
+                            <v-btn :href="flowerUri" color="primary">Flower</v-btn>
+                          </v-list-tile>
+                        </v-list>
+                      </v-card-text>
+                    </v-card>
+                  </v-flex>
+                </v-layout>
+              </v-container>
+            </v-card-text>
+          </v-card>
+        </v-flex>
+      </v-layout>
+    </v-container>
+  </v-app>
+</template>
+<script>
+import Menu from '@/components/Menu'
+import Config from '@/config'
+import ApiManager from '@/apiManager'
+
+export default {
+  name: 'Celery',
+  components: {
+    Menu
+  },
+  props: ['id_campaign', 'id_malette'],
+  data () {
+    return {
+      answer: 'You must ask something before'
+    }
+  },
+  methods: {
+    launchCelery () {
+      ApiManager.postCeleryLaunch({
+        'campaign_id': this.$refs.campaignId.$refs.input.value,
+        'malette_id': this.$refs.maletteId.$refs.input.value
+      })
+        .then(answer => {
+          this.answer = answer.data.answer
+        })
+    }
+  },
+  computed: {
+    flowerUri () {
+      return Config.server.host + ':' + Config.server.flower_port
+    }
+  }
+}
+</script>
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 538957e..fb8cce7 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -22,6 +22,7 @@ export default {
       inputs: [
         {name: 'Import data', link: 'ImportCampaign'},
         {name: 'Spark', link: 'Spark'},
+        {name: 'Celery', link: 'Celery'},
         {name: 'List', link: 'CampaignList'},
         {name: 'Virtual tour viewer', link: 'VirtualTourViewer'}
       ]
diff --git a/src/components/pathDetails/Parameter.vue b/src/components/pathDetails/Parameter.vue
index 7c76574..f1c8520 100644
--- a/src/components/pathDetails/Parameter.vue
+++ b/src/components/pathDetails/Parameter.vue
@@ -52,16 +52,16 @@ export default {
       delete this.$parent.$parent.$parent.pathDetails.id_path_details
       delete this.$parent.$parent.$parent.pathDetails.id_malette
       this.$parent.$parent.$parent.pathDetails.name = this.$refs.newName.$refs.input.value
-      //debugger
+      // debugger
       apiManager.postPathDetails(this.$parent.$parent.$parent.pathDetails)
         .then((pathDetails) => {
-          //debugger
+          // debugger
           this.$parent.$parent.$parent.pathDetails = pathDetails.data
           this.$parent.$parent.$parent.save(false)
         })
     },
     deleteAll () {
-      //debugger
+      // debugger
       this.$parent.$parent.$parent.deleteOldOne(this.$parent.$parent.$parent.pathNode)
         .then(this.$parent.$parent.$parent.loadData)
     },
diff --git a/src/config.json b/src/config.json
index c35cea1..768af7d 100644
--- a/src/config.json
+++ b/src/config.json
@@ -4,7 +4,8 @@
     "api_port": 5000,
     "dm_port": 5050,
     "status_port": 5001,
-    "graph_port": 5015
+    "graph_port": 5015,
+    "flower_port": 5555
   },
   "picture": 6
 }
diff --git a/src/router/index.js b/src/router/index.js
index 56f3a37..bd2d6bd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,7 @@ import Campaign from '@/components/campaign/Campaign'
 import PanoViewer from '@/components/PanoViewer'
 import ImportCampaign from '@/components/ImportCampaign'
 import Spark from '@/components/Spark'
+import Celery from '@/components/Celery'
 import PanoramaSelector from '@/components/panoramaSelector/PanoramaSelector'
 import PathDetailsViewer from '@/components/pathDetails/PathDetailsViewer'
 import PathDetailsEditor from '@/components/pathDetails/PathDetailsEditor'
@@ -50,6 +51,18 @@ export default new Router({
       name: 'Spark',
       component: Spark
     },
+    {
+      path: '/celery/:id_campaign/:id_malette',
+      props: true,
+      name: 'CeleryValue',
+      component: Celery
+    },
+    {
+      path: '/celery/',
+      props: false,
+      name: 'Celery',
+      component: Celery
+    },
     {
       path: '/panoramaSelector/:id_campaign/:id_malette',
       props: true,