diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot/routes.js | 26 | ||||
| -rw-r--r-- | src/components/login_form/login_form.js | 2 | ||||
| -rw-r--r-- | src/components/oauth_callback/oauth_callback.js | 2 | ||||
| -rw-r--r-- | src/components/registration/registration.js | 4 | ||||
| -rw-r--r-- | src/components/user_settings/user_settings.js | 2 | ||||
| -rw-r--r-- | src/modules/instance.js | 4 |
6 files changed, 20 insertions, 20 deletions
diff --git a/src/boot/routes.js b/src/boot/routes.js index f6a1eff8..9a249ee5 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -20,23 +20,23 @@ export default (store) => { redirect: _to => { return (store.state.users.currentUser ? store.state.instance.redirectRootLogin - : store.state.instance.redirectRootNoLogin) || '/p/main/all' + : store.state.instance.redirectRootNoLogin) || '/~/main/all' } }, - { name: 'public-external-timeline', path: '/p/main/all', component: PublicAndExternalTimeline }, - { name: 'public-timeline', path: '/p/main/public', component: PublicTimeline }, - { name: 'friends', path: '/p/main/friends', component: FriendsTimeline }, - { name: 'tag-timeline', path: '/p/tag/:tag', component: TagTimeline }, - { name: 'conversation', path: '/p/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, + { name: 'public-external-timeline', path: '/~/main/all', component: PublicAndExternalTimeline }, + { name: 'public-timeline', path: '/~/main/public', component: PublicTimeline }, + { name: 'friends', path: '/~/main/friends', component: FriendsTimeline }, + { name: 'tag-timeline', path: '/~/tag/:tag', component: TagTimeline }, + { name: 'conversation', path: '/~/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, { name: 'user-profile', path: '/:name', component: UserProfile }, { name: 'mentions', path: '/:username/mentions', component: Mentions }, { name: 'dms', path: '/:username/dms', component: DMs }, - { name: 'settings', path: '/p/settings', component: Settings }, - { name: 'registration', path: '/p/registration', component: Registration }, - { name: 'registration', path: '/p/registration/:token', component: Registration }, - { name: 'friend-requests', path: '/p/friend-requests', component: FollowRequests }, - { name: 'user-settings', path: '/p/user-settings', component: UserSettings }, - { name: 'oauth-callback', path: '/p/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) }, - { name: 'user-search', path: '/p/user-search', component: UserSearch, props: (route) => ({ query: route.query.query }) } + { name: 'settings', path: '/~/settings', component: Settings }, + { name: 'registration', path: '/~/registration', component: Registration }, + { name: 'registration', path: '/~/registration/:token', component: Registration }, + { name: 'friend-requests', path: '/~/friend-requests', component: FollowRequests }, + { name: 'user-settings', path: '/~/user-settings', component: UserSettings }, + { name: 'oauth-callback', path: '/~/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) }, + { name: 'user-search', path: '/~/user-search', component: UserSearch, props: (route) => ({ query: route.query.query }) } ] } diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index 622389d7..81426b44 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -32,7 +32,7 @@ const LoginForm = { .then((result) => { this.$store.commit('setToken', result.access_token) this.$store.dispatch('loginUser', result.access_token) - this.$router.push('/p/main/friends') + this.$router.push('/~/main/friends') }) }) } diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js index d5a8cd7d..18e24159 100644 --- a/src/components/oauth_callback/oauth_callback.js +++ b/src/components/oauth_callback/oauth_callback.js @@ -11,7 +11,7 @@ const oac = { }).then((result) => { this.$store.commit('setToken', result.access_token) this.$store.dispatch('loginUser', result.access_token) - this.$router.push('/p/main/friends') + this.$router.push('/~/main/friends') }) } } diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js index b714c38e..0618ac6c 100644 --- a/src/components/registration/registration.js +++ b/src/components/registration/registration.js @@ -27,7 +27,7 @@ const registration = { }, created () { if ((!this.registrationOpen && !this.token) || this.signedIn) { - this.$router.push('/p/main/all') + this.$router.push('/~/main/all') } }, computed: { @@ -51,7 +51,7 @@ const registration = { if (!this.$v.$invalid) { try { await this.signUp(this.user) - this.$router.push('/p/main/friends') + this.$router.push('/~/main/friends') } catch (error) { console.warn('Registration failed: ' + error) } diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index ef7ba56a..5161a25b 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -218,7 +218,7 @@ const UserSettings = { .then((res) => { if (res.status === 'success') { this.$store.dispatch('logout') - this.$router.push('/p/main/all') + this.$router.push('/~/main/all') } else { this.deleteAccountError = res.error } diff --git a/src/modules/instance.js b/src/modules/instance.js index 65f001b2..d2ddc635 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -12,8 +12,8 @@ const defaultState = { logo: '/static/logo.png', logoMask: true, logoMargin: '.2em', - redirectRootNoLogin: '/p/main/all', - redirectRootLogin: '/p/main/friends', + redirectRootNoLogin: '/~/main/all', + redirectRootLogin: '/~/main/friends', showInstanceSpecificPanel: false, scopeOptionsEnabled: true, formattingOptionsEnabled: false, |