Skip to content
Snippets Groups Projects
Commit b04698ee authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '476-invitation-code' into 'develop'

Resolve "Invitation code does not appear in registration page"

Closes #476

See merge request !374
parents 1c5268b8 420e778e
No related branches found
No related tags found
No related merge requests found
Fixed invitation code not prefilled in form when accessing invitation link (#476)
...@@ -165,11 +165,7 @@ export default { ...@@ -165,11 +165,7 @@ export default {
messages: state => state.ui.messages messages: state => state.ui.messages
}), }),
suggestedInstances () { suggestedInstances () {
let rootUrl = ( let instances = [this.$store.getters['instance/defaultUrl'](), 'https://demo.funkwhale.audio']
window.location.protocol + '//' + window.location.hostname +
(window.location.port ? ':' + window.location.port : '')
)
let instances = [rootUrl, 'https://demo.funkwhale.audio']
return instances return instances
}, },
version () { version () {
......
...@@ -100,7 +100,7 @@ export default new Router({ ...@@ -100,7 +100,7 @@ export default new Router({
name: 'signup', name: 'signup',
component: Signup, component: Signup,
props: (route) => ({ props: (route) => ({
invitation: route.query.invitation defaultInvitation: route.query.invitation
}) })
}, },
{ {
......
...@@ -2,6 +2,13 @@ import axios from 'axios' ...@@ -2,6 +2,13 @@ import axios from 'axios'
import logger from '@/logging' import logger from '@/logging'
import _ from 'lodash' import _ from 'lodash'
function getDefaultUrl () {
return (
window.location.protocol + '//' + window.location.hostname +
(window.location.port ? ':' + window.location.port : '')
)
}
export default { export default {
namespaced: true, namespaced: true,
state: { state: {
...@@ -71,6 +78,9 @@ export default { ...@@ -71,6 +78,9 @@ export default {
} }
}, },
getters: { getters: {
defaultUrl: (state) => () => {
return getDefaultUrl()
},
absoluteUrl: (state) => (relativeUrl) => { absoluteUrl: (state) => (relativeUrl) => {
if (relativeUrl.startsWith('http')) { if (relativeUrl.startsWith('http')) {
return relativeUrl return relativeUrl
...@@ -78,7 +88,9 @@ export default { ...@@ -78,7 +88,9 @@ export default {
if (state.instanceUrl.endsWith('/') && relativeUrl.startsWith('/')) { if (state.instanceUrl.endsWith('/') && relativeUrl.startsWith('/')) {
relativeUrl = relativeUrl.slice(1) relativeUrl = relativeUrl.slice(1)
} }
return state.instanceUrl + relativeUrl
let instanceUrl = state.instanceUrl || getDefaultUrl()
return instanceUrl + relativeUrl
} }
}, },
actions: { actions: {
......
...@@ -7522,9 +7522,9 @@ void-elements@^2.0.0, void-elements@^2.0.1: ...@@ -7522,9 +7522,9 @@ void-elements@^2.0.0, void-elements@^2.0.1:
version "2.0.1" version "2.0.1"
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
vue-gettext@^2.0.31: vue-gettext@^2.1.0:
version "2.0.31" version "2.1.0"
resolved "https://registry.yarnpkg.com/vue-gettext/-/vue-gettext-2.0.31.tgz#0f113bea6aed747e2a809ae4a0db83eaac0b07fc" resolved "https://registry.yarnpkg.com/vue-gettext/-/vue-gettext-2.1.0.tgz#e4932037a8601412dd9f7d7d7a5d60c4bdb341d1"
vue-hot-reload-api@^2.1.0: vue-hot-reload-api@^2.1.0:
version "2.3.0" version "2.3.0"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment