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

Improved UX of instance-picking form

Browse source
This commit is contained in:
Eliot Berriot 2019-01-17 12:17:29 +01:00
parent 6cf775512a
commit d28e252109
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
4 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
front/src/App.vue
View file

@ -28,7 +28,7 @@
</p>
<div class="ui bulleted list">
<div class="ui item" v-for="url in suggestedInstances">
<a @click="instanceUrl = url">{{ url }}</a>
<a @click="instanceUrl = url; $store.dispatch('instance/setUrl', url)">{{ url }}</a>
</div>
</div>
</form>
@ -198,12 +198,18 @@ export default {
messages: state => state.ui.messages
}),
suggestedInstances () {
let instances = []
let instances = this.$store.state.instance.knownInstances.slice(0)
console.log('instance', instances)
if (this.$store.state.instance.frontSettings.defaultServerUrl) {
instances.push(this.$store.state.instance.frontSettings.defaultServerUrl)
let serverUrl = this.$store.state.instance.frontSettings.defaultServerUrl
if (!serverUrl.endsWith('/')) {
serverUrl = serverUrl + '/'
}
instances.push(serverUrl)
}
instances.push(this.$store.getters['instance/defaultUrl'](), 'https://demo.funkwhale.audio')
return instances
instances.push(this.$store.getters['instance/defaultUrl'](), 'https://demo.funkwhale.audio/')
console.log('HELLO', instances)
return _.uniq(instances.filter((e) => {return e}))
},
version () {
if (!this.nodeinfo) {