From 4741d04950d78f1099d8ed5f8594d51c8e2a64da Mon Sep 17 00:00:00 2001 From: zeus Date: Tue, 18 Jan 2022 04:36:35 +0200 Subject: [PATCH] new MENOU version 1 --- .gitignore | 6 +- src-local/llo/new.js | 7 + src/App.vue | 22 +- .../manageservices/view-dashboard.vue | 28 +- src/components/mymicroservices.vue | 100 +++- src/components/mymicroservicescustom.vue | 79 ++- src/components/mynetwork.vue | 65 +-- src/components/mynetwork/AdhocView.vue | 38 +- .../mynetwork/availablemicroservices.vue | 453 ++++++++++++++---- .../availablemicroservicescustom.vue | 340 ++++++++++--- src/components/mynetwork/availablepoc.vue | 37 +- .../mynetwork/availableservices.vue | 267 +++++++++-- src/components/mynetwork/availablestorage.vue | 36 +- .../mynetwork/buildermyservices.vue | 11 +- src/components/mynetwork/builderservices.vue | 18 +- src/components/mynetwork/customservices.vue | 3 +- src/components/mynetwork/dockerservices.vue | 91 +++- src/components/mynetwork/images.vue | 212 ++++++-- src/components/mynetwork/mytable.vue | 137 ++++-- src/components/mynetwork/networks.vue | 120 ++++- 20 files changed, 1635 insertions(+), 435 deletions(-) diff --git a/.gitignore b/.gitignore index c1c819d..83549bb 100644 --- a/.gitignore +++ b/.gitignore @@ -18,8 +18,10 @@ viwsession/ testfilemanager/ README-update -src-local/community/rootapostolos@swarmlab.io_mytest1_microservice-ipterm -src-local/community/rootapostolos@swarmlab.io_ansibletest_microservice-alpine313 +src-local/community/rootapostolos@swarmlab.io_mytest1_microservice-ipterm/ +src-local/community/rootapostolos@swarmlab.io_ansibletest_microservice-alpine313/ +src-local/community/cse242017102@uniwa.gr_test_microservice-nodejs/ +src-local/builders/bento-swarmlab/ swarmlabdoc.js swarmlabdoc.asciidoc_config diff --git a/src-local/llo/new.js b/src-local/llo/new.js index c780b0b..767736a 100644 --- a/src-local/llo/new.js +++ b/src-local/llo/new.js @@ -3964,6 +3964,7 @@ SWARMLAB_STORAGE_PASSWORD=${service_password} var services_path = './instance/'+service+'/'+service var services_pathexec = process.cwd() var stopeditexec = `/bin/bash ./stop-sidecar-edit-service.sh ${service}` + try { const stopedit = spawn(stopeditexec, { stdio: 'pipe', shell: true, @@ -3999,6 +4000,12 @@ SWARMLAB_STORAGE_PASSWORD=${service_password} }); }); + } catch (error) { + console.log('Error:', error); + var n = {} + n.data = error + io.emit('message_close', n); + } }); socket.on('stop_storage', (service) => { diff --git a/src/App.vue b/src/App.vue index 94c0e79..d06fd32 100644 --- a/src/App.vue +++ b/src/App.vue @@ -268,9 +268,11 @@ LabRoom Storage - MicroServices Proof_of_concept - Users images + + MicroServices @@ -358,9 +360,11 @@ - - + + @@ -783,25 +787,35 @@ export default { this.hybridmenou = action //console.log(action) if(action == 'bootstrap'){ + this.$root.$emit('hybrid_console_not_view',true) this.$root.$emit('hybrid_refresh_dockerservices') }else if(action == 'dashboard'){ + this.$root.$emit('hybrid_console_not_view',true) console.log('dashboard '+action) }else if(action == 'dashboardall'){ + this.$root.$emit('hybrid_console_not_view',true) console.log('dashboardall '+action) }else if(action == 'connect-server'){ + this.$root.$emit('hybrid_console_not_view',true) this.$root.$emit('hybrid_connect_server') }else if(action == 'llo'){ + this.$root.$emit('hybrid_console_not_view',true) console.log('llo '+action) //this.$root.$emit('hybrid_manage_llo') }else if(action == 'services'){ + this.$root.$emit('hybrid_console_not_view',true) this.$root.$emit('hybrid_refresh_availableservices') }else if(action == 'manage_service'){ + this.$root.$emit('hybrid_console_not_view',true) //this.$root.$emit('hybrid_manage_service') }else if(action == 'storage'){ + this.$root.$emit('hybrid_console_not_view',true) //this.$root.$emit('hybrid_manage_service') }else if(action == 'microservice'){ + this.$root.$emit('hybrid_console_not_view',false) //this.$root.$emit('hybrid_manage_service') }else if(action == 'proofofconcept'){ + this.$root.$emit('hybrid_console_not_view',true) //this.$root.$emit('hybrid_manage_service') }else if(action == 'manage_deploy'){ } diff --git a/src/components/manageservices/view-dashboard.vue b/src/components/manageservices/view-dashboard.vue index b5334d7..92abb6e 100644 --- a/src/components/manageservices/view-dashboard.vue +++ b/src/components/manageservices/view-dashboard.vue @@ -1,9 +1,11 @@