moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix redirect paths

This commit is contained in:
Maxim Filippov 2018-12-06 20:23:47 +03:00
parent 54c6438b17
commit 7d5794b9fa
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/login_form/login_form.js
View File

@ -32,7 +32,7 @@ const LoginForm = {
.then((result) => { .then((result) => {
this.$store.commit('setToken', result.access_token) this.$store.commit('setToken', result.access_token)
this.$store.dispatch('loginUser', result.access_token) this.$store.dispatch('loginUser', result.access_token)
this.$router.push('/main/friends') this.$router.push('/p/main/friends')
}) })
}) })
} }

2
src/components/oauth_callback/oauth_callback.js
View File

@ -11,7 +11,7 @@ const oac = {
}).then((result) => { }).then((result) => {
this.$store.commit('setToken', result.access_token) this.$store.commit('setToken', result.access_token)
this.$store.dispatch('loginUser', result.access_token) this.$store.dispatch('loginUser', result.access_token)
this.$router.push('/main/friends') this.$router.push('/p/main/friends')
}) })
} }
} }

4
src/components/registration/registration.js
View File

@ -27,7 +27,7 @@ const registration = {
}, },
created () { created () {
if ((!this.registrationOpen && !this.token) || this.signedIn) { if ((!this.registrationOpen && !this.token) || this.signedIn) {
this.$router.push('/main/all') this.$router.push('/p/main/all')
} }
}, },
computed: { computed: {
@ -51,7 +51,7 @@ const registration = {
if (!this.$v.$invalid) { if (!this.$v.$invalid) {
try { try {
await this.signUp(this.user) await this.signUp(this.user)
this.$router.push('/main/friends') this.$router.push('/p/main/friends')
} catch (error) { } catch (error) {
console.warn('Registration failed: ' + error) console.warn('Registration failed: ' + error)
} }

2
src/components/user_settings/user_settings.js
View File

@ -218,7 +218,7 @@ const UserSettings = {
.then((res) => { .then((res) => {
if (res.status === 'success') { if (res.status === 'success') {
this.$store.dispatch('logout') this.$store.dispatch('logout')
this.$router.push('/main/all') this.$router.push('/p/main/all')
} else { } else {
this.deleteAccountError = res.error this.deleteAccountError = res.error
} }

4
src/modules/instance.js
View File

@ -12,8 +12,8 @@ const defaultState = {
logo: '/static/logo.png', logo: '/static/logo.png',
logoMask: true, logoMask: true,
logoMargin: '.2em', logoMargin: '.2em',
redirectRootNoLogin: '/main/all', redirectRootNoLogin: '/p/main/all',
redirectRootLogin: '/main/friends', redirectRootLogin: '/p/main/friends',
showInstanceSpecificPanel: false, showInstanceSpecificPanel: false,
scopeOptionsEnabled: true, scopeOptionsEnabled: true,
formattingOptionsEnabled: false, formattingOptionsEnabled: false,

4
static/config.json
View File

@ -4,8 +4,8 @@
"logo": "/static/logo.png", "logo": "/static/logo.png",
"logoMask": true, "logoMask": true,
"logoMargin": ".1em", "logoMargin": ".1em",
"redirectRootNoLogin": "/main/all", "redirectRootNoLogin": "/p/main/all",
"redirectRootLogin": "/main/friends", "redirectRootLogin": "/p/main/friends",
"chatDisabled": false, "chatDisabled": false,
"showInstanceSpecificPanel": false, "showInstanceSpecificPanel": false,
"scopeOptionsEnabled": false, "scopeOptionsEnabled": false,