zeus
/
swarmlab-hybrid
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

add web url

master
zeus 3 years ago
parent
a83300c7ad
commit
0f526e743b
7 changed files with 54 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/index.html
  2. 2
      dist/js/app.368faa18.js
  3. 1
      dist/js/app.368faa18.js.map
  4. 2
      dist/js/app.dcbd1a1a.js
  5. 1
      dist/js/app.dcbd1a1a.js.map
  6. 45
      src/components/mynetwork/mytable.vue
  7. 10
      src/config/index-web.js

2
dist/index.html
View File

@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="/css/app.25658f84.css" rel="preload" as="style"><link href="/css/chunk-vendors.e469b508.css" rel="preload" as="style"><link href="/js/app.dcbd1a1a.js" rel="preload" as="script"><link href="/js/chunk-vendors.d8d18fe6.js" rel="preload" as="script"><link href="/css/chunk-vendors.e469b508.css" rel="stylesheet"><link href="/css/app.25658f84.css" rel="stylesheet"></head><body><div id="app"></div><script src="/js/chunk-vendors.d8d18fe6.js"></script><script src="/js/app.dcbd1a1a.js"></script></body></html> <!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Vue App</title><link href="/css/app.25658f84.css" rel="preload" as="style"><link href="/css/chunk-vendors.e469b508.css" rel="preload" as="style"><link href="/js/app.368faa18.js" rel="preload" as="script"><link href="/js/chunk-vendors.d8d18fe6.js" rel="preload" as="script"><link href="/css/chunk-vendors.e469b508.css" rel="stylesheet"><link href="/css/app.25658f84.css" rel="stylesheet"></head><body><div id="app"></div><script src="/js/chunk-vendors.d8d18fe6.js"></script><script src="/js/app.368faa18.js"></script></body></html>

2
dist/js/app.368faa18.js
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.368faa18.js.map
View File

File diff suppressed because one or more lines are too long

2
dist/js/app.dcbd1a1a.js
View File

File diff suppressed because one or more lines are too long

1
dist/js/app.dcbd1a1a.js.map
View File

File diff suppressed because one or more lines are too long

45
src/components/mynetwork/mytable.vue
View File

@ -242,6 +242,7 @@ import Vue from 'vue'
import card from '@/components/Card.vue' import card from '@/components/Card.vue'
import {ApiConfig} from "@/config/index"; import {ApiConfig} from "@/config/index";
import {ApiConfigGUI} from "@/config/index-gui"; import {ApiConfigGUI} from "@/config/index-gui";
import {ApiConfigWEB} from "@/config/index-web";
import { extend } from 'vee-validate'; import { extend } from 'vee-validate';
import { required, alpha_num } from 'vee-validate/dist/rules'; import { required, alpha_num } from 'vee-validate/dist/rules';
@ -569,10 +570,10 @@ export default {
var log = await store.dispatch("pipelineLLO/getshareinfo",{ var log = await store.dispatch("pipelineLLO/getshareinfo",{
instance:this.hybridshowdata.Names instance:this.hybridshowdata.Names
}) })
console.log('logs---------- ' + JSON.stringify(this.hybridshowdata)) //console.log('logs---------- ' + JSON.stringify(this.hybridshowdata))
console.log('logs1---------- ' + JSON.stringify(this.hybridshowdata.Names)) //console.log('logs1---------- ' + JSON.stringify(this.hybridshowdata.Names))
console.log('logsserver---------- ' + JSON.stringify(log.data.container)) //console.log('logsserver---------- ' + JSON.stringify(log.data.container))
console.log('logsserver1---------- ' + JSON.stringify(log.data.network)) //console.log('logsserver1---------- ' + JSON.stringify(log.data.network))
this.hybridshowdatashare = log.data.network this.hybridshowdatashare = log.data.network
var IP = this.hybridshowdatashare.IPv4Address.split('/'); var IP = this.hybridshowdatashare.IPv4Address.split('/');
var search1 = '->' var search1 = '->'
@ -701,7 +702,6 @@ export default {
var swarmlabinstance1ca = new RegExp("(microservice-codeserver)"); var swarmlabinstance1ca = new RegExp("(microservice-codeserver)");
var pocurlcodeserver = 'no' var pocurlcodeserver = 'no'
if(swarmlabinstance1ca.test(this.hybridshowdata.Names)){ if(swarmlabinstance1ca.test(this.hybridshowdata.Names)){
//console.log('stringify--1------- ' + JSON.stringify(this.hybridshowdata.Names));
var swarmlabinstance1cda = new RegExp("(->)"); var swarmlabinstance1cda = new RegExp("(->)");
if(swarmlabinstance1cda.test(this.hybridshowdata.Ports)){ if(swarmlabinstance1cda.test(this.hybridshowdata.Ports)){
var splitcda = this.hybridshowdata.Ports.split(':') var splitcda = this.hybridshowdata.Ports.split(':')
@ -749,6 +749,41 @@ if(pocurlcodeserver != 'no'){
info +='</p>' info +='</p>'
} }
var urlgenWEB = this.hybridshowdata.Names.split('_');
var pocurletherpadserver = 'no'
for(var i = 0; i < ApiConfigWEB.length; i++) {
var obWEB = ApiConfigWEB[i];
if(obWEB.name == urlgenWEB[0]){
var swarmlabinstance1cda1 = new RegExp("(->)");
if(swarmlabinstance1cda1.test(this.hybridshowdata.Ports)){
var splitcda1 = this.hybridshowdata.Ports.split(':')
var splitcd1a1 = splitcda1[1].split('-')
pocurletherpadserver = 'http://localhost:'+splitcd1a1[0]+'/?token='+this.token
}
}
}
// -----
/*
var swarmlabinstance1ca1 = new RegExp("(microservice-etherpad)");
var pocurletherpadserver = 'no'
if(swarmlabinstance1ca1.test(this.hybridshowdata.Names)){
var swarmlabinstance1cda1 = new RegExp("(->)");
if(swarmlabinstance1cda1.test(this.hybridshowdata.Ports)){
var splitcda1 = this.hybridshowdata.Ports.split(':')
var splitcd1a1 = splitcda1[1].split('-')
pocurletherpadserver = 'http://localhost:'+splitcd1a1[0]+'/?token='+this.token
}
}
*/
if(pocurletherpadserver != 'no'){
info +='<p class="text-info">'
info += '<a href="'+pocurletherpadserver+'" target="_blank">Click here to open the Web_App</a>'
info +='</p>'
}
// -----
var pocmypathinfo = '' var pocmypathinfo = ''
if(pocmypath != ''){ if(pocmypath != ''){

10
src/config/index-web.js
View File

@ -0,0 +1,10 @@
export const ApiConfigWEB = [
{
"name": "microservice-etherpad",
"automated": true,
"version": 0,
"port": 0
}
];
Write Preview
Loading…
Cancel
Save