diff --git a/src/App.vue b/src/App.vue index e7e2dd8c..ffe1261e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -26,7 +26,6 @@ export default { async mounted () { this.$initWait() this.updateTitle(this.$route) - await this.$router.push({ name: 'dashboard' }) }, methods: { updateTitle: function (route) { diff --git a/src/boot/routes.js b/src/boot/routes.js index 0165ef6f..944afd5d 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -54,7 +54,5 @@ export default ({ app, router, store }) => { subscriberId: getSubscriberId() }) } - - store.$router = router Dark.set(true) } diff --git a/src/layouts/CscLayoutMain.vue b/src/layouts/CscLayoutMain.vue index 82cfe5d0..b16458f3 100644 --- a/src/layouts/CscLayoutMain.vue +++ b/src/layouts/CscLayoutMain.vue @@ -536,9 +536,6 @@ export default { }) } window.scrollTo(0, 0) - if (route.path === '/user/dashboard') { - this.forwardHome() - } } }, async mounted () { @@ -553,7 +550,6 @@ export default { }, methods: { ...mapActions('user', [ - 'forwardHome', 'fetchAuthToken' ]), ...mapActions('call', [ diff --git a/src/router/routes.js b/src/router/routes.js index 313f2bf2..6249f307 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -560,7 +560,7 @@ const routes = [ { path: '/', redirect: { - name: 'root' + name: 'dashboard' } }, { diff --git a/src/store/user.js b/src/store/user.js index c254ce74..48aab8bb 100644 --- a/src/store/user.js +++ b/src/store/user.js @@ -362,13 +362,10 @@ export default { console.log(err) } } - await context.dispatch('forwardHome') } catch (err) { console.debug(err) await context.dispatch('logout') } - } else { - await context.dispatch('forwardHome') } }, async changePassword (context, newPassword) { @@ -400,12 +397,6 @@ export default { commit('userPasswordFailed', err.message) } }, - async forwardHome (context) { - const start = '/user/dashboard' - if (context.rootState.route?.path !== start) { - await this.$router.push({ name: 'root' }) - } - }, async getCustomLogo (context) { if (!context.state.logo) { context.commit('updateLogoRequestState', true)