diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 418422997..fcb4e6fc6 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -50,7 +50,7 @@ const routes = [ path: '/thx/:comingFrom', component: () => import('../views/Pages/thx.vue'), beforeEnter: (to, from, next) => { - const validFrom = ['password', 'reset', 'register', 'login', 'Login'] + const validFrom = ['password', 'reset', 'register', 'login', 'checkEmail'] if (!validFrom.includes(from.path.split('/')[1])) { next({ path: '/login' }) } else { diff --git a/frontend/src/views/Pages/ForgotPassword.spec.js b/frontend/src/views/Pages/ForgotPassword.spec.js index 47c9fad56..41f1575cd 100644 --- a/frontend/src/views/Pages/ForgotPassword.spec.js +++ b/frontend/src/views/Pages/ForgotPassword.spec.js @@ -63,7 +63,7 @@ describe('ForgotPassword', () => { }) it('links to login', () => { - expect(wrapper.findComponent(RouterLinkStub).props().to).toEqual('/Login') + expect(wrapper.findComponent(RouterLinkStub).props().to).toEqual('/login') }) }) diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue index c8b31246f..654711dc7 100644 --- a/frontend/src/views/Pages/ForgotPassword.vue +++ b/frontend/src/views/Pages/ForgotPassword.vue @@ -32,7 +32,7 @@
- {{ $t('back') }} + {{ $t('back') }}