Merge branch 'master' of https://github.com/unarxiv/cvpm

dashboard/src/components/CVPM-Request.vue

@@ -24,7 +24,7 @@
             <cvpm-image-upload v-on:fileSelected="onFileSelected"></cvpm-image-upload>
           </v-stepper-content>
           <v-stepper-content step="2">
-            <cvpm-parameter-input :file=file v-on:finishInfer="onFinishInfer"></cvpm-parameter-input>
+            <cvpm-parameter-input :file=file v-on:finishInfer="onFinishInfer" :vendor=selectedVendor :packageName=selectedPackage :solverName=selectedSolver></cvpm-parameter-input>
           </v-stepper-content>
           <v-stepper-content step="3">
             <cvpm-json-view :jsonObject="inferResponse"></cvpm-json-view>

dashboard/src/components/basic/CVPM-Parameter-Input.vue

@@ -63,7 +63,7 @@ export default {
       solverDefinedParams: []
     }
   },
-  props: ['file'],
+  props: ['file', 'vendor', 'packageName', 'solverName'],
   methods: {
     addParams () {
       this.solverDefinedParams.push({
@@ -74,9 +74,17 @@ export default {
     startTest () {
       let self = this
       self.loading = true
-      const requestParams = this.systemRequiredParams.concat(this.solverDefinedParams)
+      const requestParams = this.systemRequiredParams.concat(
+        this.solverDefinedParams
+      )
       systemService
-        .testRepoSolver('8080', requestParams, this.file)
+        .testRepoSolver(
+          this.vendor,
+          this.packageName,
+          this.solverName,
+          requestParams,
+          this.file
+        )
         .then(function (res) {
           self.loading = false
           self.$emit('finishInfer', res)

dashboard/src/main.js

@@ -10,16 +10,18 @@ import VueSocketIO from 'vue-socket.io'
 import TreeView from 'vue-json-tree-view'
 import VueTour from 'vue-tour'
 import colors from 'vuetify/es5/util/colors'
+import { ConfigService } from '@/services/config'
 
 import 'vuetify/dist/vuetify.min.css'
 import '@/assets/styles/main.css'
 import 'vue-tour/dist/vue-tour.css'
 
 import i18n from '@/i18n'
+const configService = new ConfigService()
 
 Vue.use(new VueSocketIO({
   debug: false,
-  connection: 'http://192.168.1.11:10590'
+  connection: configService.endpoint
 }))
 Vue.use(Vuetify)
 Vue.use(TreeView)

dashboard/src/services/system.js

@@ -64,17 +64,14 @@ class SystemService {
       })
     })
   }
-  testRepoSolver (port, parameters, file) {
+  testRepoSolver (vendor, packageName, solver, parameters, file) {
     return new Promise((resolve, reject) => {
       let payload = new FormData()
       payload.append('file', file)
       for (let i = 0; i < parameters.length; i++) {
         payload.append(parameters[i].key, parameters[i].value)
       }
-      var parser = document.createElement('a')
-      parser.href = this.endpoint
-      parser.port = port
-      axios.post(parser.href + '/infer', payload).then(function (res) {
+      axios.post(this.endpoint + '/solvers/' + vendor + '/' + packageName + '/' + solver, payload).then(function (res) {
         resolve(res)
       }).catch(function (err) {
         reject(err)

docs/en-US/guide/privacy.md

@@ -0,0 +1,13 @@
+# Privacy Declaration
+
+## Collected Data
+
+We only collected only a small amount of your personal data for analysis and bug tracking. The data we collected generally includes:
+* Running Status, Errors and Exceptions. This is used to help us improve the performance and resolve bugs.
+* 
+
+## How will it be used?
+
+## Turn it Off
+
+## 

docs/zh-CN/guide/privacy.md

@@ -0,0 +1 @@
+# Privacy Declaration