diff --git a/frontend/src/components/SidebarPlugin/SideBar.vue b/frontend/src/components/SidebarPlugin/SideBar.vue index ff683efbd..054381df8 100755 --- a/frontend/src/components/SidebarPlugin/SideBar.vue +++ b/frontend/src/components/SidebarPlugin/SideBar.vue @@ -81,7 +81,7 @@ :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`" class="nav-link text-lg" > - {{ $t('site.sidebar.members_area') }} + {{ $t('members_area') }} diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index aae7c7a08..3b9d2e217 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -7,6 +7,7 @@ "signup": "Registrieren", "imprint":"Impressum", "privacy_policy":"Datenschutzerklärung", + "members_area": "Mitgliedsbereich", "back":"Zurück", "send":"Senden", "transactions":"Transaktionen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index f2aa0d17f..d05a9e0d5 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -7,6 +7,7 @@ "signup": "Sign up", "imprint":"Legal notice", "privacy_policy":"Privacy policy", + "members_area": "Member's area", "back":"Back", "send":"Send", "transactions":"Transactions", diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js index 0afb54ac4..cd3646fe0 100644 --- a/frontend/src/routes/router.js +++ b/frontend/src/routes/router.js @@ -8,6 +8,7 @@ Vue.use(VueRouter) const router = new VueRouter({ routes, // short for routes: routes linkActiveClass: 'active', + mode: 'history', scrollBehavior: (to, from, savedPosition) => { if (savedPosition) { return savedPosition diff --git a/frontend/src/views/KontoOverview/GddSend.vue b/frontend/src/views/KontoOverview/GddSend.vue index 7a6997e60..d32fadea2 100644 --- a/frontend/src/views/KontoOverview/GddSend.vue +++ b/frontend/src/views/KontoOverview/GddSend.vue @@ -138,21 +138,21 @@ - {{ $store.state.ajaxCreateData.email }} + {{ ajaxCreateData.email }} {{ $t('form.receiver') }} - {{ $store.state.ajaxCreateData.amount }} GDD + {{ ajaxCreateData.amount }} GDD {{ $t('form.amount') }} - {{ $store.state.ajaxCreateData.memo }} + {{ ajaxCreateData.memo }} {{ $t('form.message') }} - {{ $moment($store.state.ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }} + {{ $moment(ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }} {{ $t('form.date') }} diff --git a/frontend/src/views/Layout/ContentFooter.vue b/frontend/src/views/Layout/ContentFooter.vue index 4f4690a0d..a12831a49 100755 --- a/frontend/src/views/Layout/ContentFooter.vue +++ b/frontend/src/views/Layout/ContentFooter.vue @@ -28,7 +28,7 @@ :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`" target="_blank" > - {{ $t('site.sidebar.members_area') }} + {{ $t('members_area') }} diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js index 1983211f2..3625df05e 100644 --- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js +++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js @@ -83,7 +83,7 @@ describe('DashboardLayoutGdd', () => { }) it('has first item "send" in navbar', () => { - expect(navbar.findAll('ul > li').at(0).text()).toEqual('sent') + expect(navbar.findAll('ul > li').at(0).text()).toEqual('send') }) it('has first item "send" linked to overview in navbar', () => { diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 4fa5ab0d0..4f3aff146 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -75,6 +75,7 @@ server { rewrite /vue/(.*) /$1; } + #try_files /vue/$uri /vue/$uri/ /index.html; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade;