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 @@ Global campaign view - Stitch it + Spark + + + Celery Panorama selection 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 @@ + + + + + + + + Celery + + + + + + + + + + + + + + + + + + Launch celery + + + + + + + Answer: + {{answer}} + + + + Flower + + + + + + + + + + + + + + + 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/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/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/Parameter.vue b/src/components/pathDetails/Parameter.vue index 86cab4f..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/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 @@ - - - - - - - - Path details viewer: {{id_campaign}}-{{id_malette}} - - - - - - - - {{props.item.name}} - {{props.item.decription}} - {{props.item.id_path_details}} - {{props.item.id_malette}} - {{pathNodes[props.item.id_path_details].length}} - - - - - - - - - Editor - - - - - - - - - - - New - - - New path details for campaign {{id_campaign}}/{{id_malette}} - - - - - - - - Create - - - - - - - - - - - - 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,