rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated host links to use store baseUri

Browse source
This commit is contained in:
Joel Collins 2019-11-27 11:32:00 +00:00
parent 293e0665c6
commit 39d45bc749
7 changed files with 29 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/controlComponents/paneCapture.vue
View file

@ -410,9 +410,7 @@ export default {
// Get plugin action link
var link = plugins.ScanPlugin.views.tile.links.self;
// Store plugin action URI
this.scanUri = `http://${this.$store.state.host}:${
this.$store.state.port
}${link}`;
this.scanUri = `${this.$store.getters.baseUri}${link}`;
}
})
.catch(error => {

20
src/components/controlComponents/paneNavigate.vue
View file

@ -180,19 +180,13 @@ export default {
computed: {
moveActionUri: function() {
return `http://${this.$store.state.host}:${
this.$store.state.port
}/api/v2/actions/stage/move`;
return `${this.$store.getters.baseUri}/api/v2/actions/stage/move`;
},
positionStatusUri: function() {
return `http://${this.$store.state.host}:${
this.$store.state.port
}/api/v2/status/stage/position`;
return `${this.$store.getters.baseUri}/api/v2/status/stage/position`;
},
pluginsUri: function() {
return `http://${this.$store.state.host}:${
this.$store.state.port
}/api/v2/plugins`;
return `${this.$store.getters.baseUri}/api/v2/plugins`;
}
},
@ -343,11 +337,9 @@ export default {
plugins.AutofocusPlugin.views.fast_autofocus.links.self;
var normalLink = plugins.AutofocusPlugin.views.autofocus.links.self;
// Store plugin action URI
this.fastAutofocusUri = `http://${this.$store.state.host}:${
this.$store.state.port
}${fastLink}`;
this.normalAutofocusUri = `http://${this.$store.state.host}:${
this.$store.state.port
this.fastAutofocusUri = `${this.$store.getters.baseUri}${fastLink}`;
this.normalAutofocusUri = `${
this.$store.getters.baseUri
}${normalLink}`;
}
})

8
src/components/controlComponents/paneStatus.vue
View file

@ -69,14 +69,10 @@ export default {
computed: {
settingsUri: function() {
return `http://${this.$store.state.host}:${
this.$store.state.port
}/api/v2/settings`;
return `${this.$store.getters.baseUri}/api/v2/settings`;
},
statusUri: function() {
return `http://${this.$store.state.host}:${
this.$store.state.port
}/api/v2/status`;
return `${this.$store.getters.baseUri}/api/v2/status`;
}
},

12
src/components/controlComponents/settingsComponents/cameraSettings.vue
View file

@ -93,14 +93,10 @@ export default {
computed: {
settingsUri: function() {
return `http://${this.$store.state.host}:${
this.$store.state.port
}/api/v2/settings`;
return `${this.$store.getters.baseUri}/api/v2/settings`;
},
pluginsUri: function() {
return `http://${this.$store.state.host}:${
this.$store.state.port
}/api/v2/plugins`;
return `${this.$store.getters.baseUri}/api/v2/plugins`;
}
},
@ -132,9 +128,7 @@ export default {
var link =
plugins.AutocalibrationPlugin.views.recalibrate.links.self;
// Store plugin action URI
this.recalibrationUri = `http://${this.$store.state.host}:${
this.$store.state.port
}${link}`;
this.recalibrationUri = `${this.$store.getters.baseUri}${link}`;
}
})
.catch(error => {

4
src/components/controlComponents/settingsComponents/microscopeSettings.vue
View file

@ -80,9 +80,7 @@ export default {
computed: {
settingsUri: function() {
return `http://${this.$store.state.host}:${
this.$store.state.port
}/api/v2/settings`;
return `${this.$store.getters.baseUri}/api/v2/settings`;
}
},