yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-03 22:49:16 +02:00
Code Issues Releases Wiki Activity

Fix #650: Support setting a server URL in settings.json

Browse source
This commit is contained in:
Eliot Berriot 2019-01-15 14:56:51 +01:00
parent 6d0a4594c4
commit c20f1ad22e
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
5 changed files with 104 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
front/src/App.vue
View file

@ -93,7 +93,11 @@ export default {
self.$store.commit('ui/computeLastDate')
}, 1000 * 60)
if (!this.$store.state.instance.instanceUrl) {
let defaultInstanceUrl = process.env.VUE_APP_INSTANCE_URL || this.$store.getters['instance/defaultUrl']()
// we have several way to guess the API server url. By order of precedence:
// 1. use the url provided in settings.json, if any
// 2. use the url specified when building via VUE_APP_INSTANCE_URL
// 3. use the current url
let defaultInstanceUrl = this.$store.state.instance.frontSettings.defaultServerUrl || process.env.VUE_APP_INSTANCE_URL || this.$store.getters['instance/defaultUrl']()
this.$store.commit('instance/instanceUrl', defaultInstanceUrl)
} else {
// needed to trigger initialization of axios
@ -194,7 +198,11 @@ export default {
messages: state => state.ui.messages
}),
suggestedInstances () {
let instances = [this.$store.getters['instance/defaultUrl'](), 'https://demo.funkwhale.audio']
let instances = []
if (this.$store.state.instance.frontSettings.defaultServerUrl) {
instances.push(this.$store.state.instance.frontSettings.defaultServerUrl)
}
instances.push(this.$store.getters['instance/defaultUrl'](), 'https://demo.funkwhale.audio')
return instances
},
version () {