IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167 from gradido/remove-hashtag-from-route

Browse Source 
fix: Remove Hashtag From Route
This commit is contained in:
Ulf Gebhardt 2021-04-13 00:57:06 +02:00 committed by GitHub
commit f02200de91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/SidebarPlugin/SideBar.vue
View File

@ -81,7 +81,7 @@
:href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`" :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`"
class="nav-link text-lg" class="nav-link text-lg"
> >
{{ $t('site.sidebar.members_area') }} {{ $t('members_area') }}
</a> </a>
</li> </li>
</ul> </ul>

1
frontend/src/locales/de.json
View File

@ -7,6 +7,7 @@
"signup": "Registrieren", "signup": "Registrieren",
"imprint":"Impressum", "imprint":"Impressum",
"privacy_policy":"Datenschutzerklärung", "privacy_policy":"Datenschutzerklärung",
"members_area": "Mitgliedsbereich",
"back":"Zurück", "back":"Zurück",
"send":"Senden", "send":"Senden",
"transactions":"Transaktionen", "transactions":"Transaktionen",

1
frontend/src/locales/en.json
View File

@ -7,6 +7,7 @@
"signup": "Sign up", "signup": "Sign up",
"imprint":"Legal notice", "imprint":"Legal notice",
"privacy_policy":"Privacy policy", "privacy_policy":"Privacy policy",
"members_area": "Member's area",
"back":"Back", "back":"Back",
"send":"Send", "send":"Send",
"transactions":"Transactions", "transactions":"Transactions",

1
frontend/src/routes/router.js
View File

@ -8,6 +8,7 @@ Vue.use(VueRouter)
const router = new VueRouter({ const router = new VueRouter({
routes, // short for routes: routes routes, // short for routes: routes
linkActiveClass: 'active', linkActiveClass: 'active',
mode: 'history',
scrollBehavior: (to, from, savedPosition) => { scrollBehavior: (to, from, savedPosition) => {
if (savedPosition) { if (savedPosition) {
return savedPosition return savedPosition

8
frontend/src/views/KontoOverview/GddSend.vue
View File

@ -138,21 +138,21 @@
<b-list-group> <b-list-group>
<b-list-group-item class="d-flex justify-content-between align-items-center"> <b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $store.state.ajaxCreateData.email }} {{ ajaxCreateData.email }}
<b-badge variant="primary" pill>{{ $t('form.receiver') }}</b-badge> <b-badge variant="primary" pill>{{ $t('form.receiver') }}</b-badge>
</b-list-group-item> </b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center"> <b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $store.state.ajaxCreateData.amount }} GDD {{ ajaxCreateData.amount }} GDD
<b-badge variant="primary" pill>{{ $t('form.amount') }}</b-badge> <b-badge variant="primary" pill>{{ $t('form.amount') }}</b-badge>
</b-list-group-item> </b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center"> <b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $store.state.ajaxCreateData.memo }} {{ ajaxCreateData.memo }}
<b-badge variant="primary" pill>{{ $t('form.message') }}</b-badge> <b-badge variant="primary" pill>{{ $t('form.message') }}</b-badge>
</b-list-group-item> </b-list-group-item>
<b-list-group-item class="d-flex justify-content-between align-items-center"> <b-list-group-item class="d-flex justify-content-between align-items-center">
{{ $moment($store.state.ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }} {{ $moment(ajaxCreateData.target_date).format('DD.MM.YYYY - HH:mm:ss') }}
<b-badge variant="primary" pill>{{ $t('form.date') }}</b-badge> <b-badge variant="primary" pill>{{ $t('form.date') }}</b-badge>
</b-list-group-item> </b-list-group-item>
</b-list-group> </b-list-group>

2
frontend/src/views/Layout/ContentFooter.vue
View File

@ -28,7 +28,7 @@
:href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`" :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`"
target="_blank" target="_blank"
> >
{{ $t('site.sidebar.members_area') }} {{ $t('members_area') }}
</b-nav-item> </b-nav-item>
</b-nav> </b-nav>
</b-col> </b-col>

2
frontend/src/views/Layout/DashboardLayout_gdd.spec.js
View File

@ -83,7 +83,7 @@ describe('DashboardLayoutGdd', () => {
}) })
it('has first item "send" in navbar', () => { 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', () => { it('has first item "send" linked to overview in navbar', () => {

1
nginx/nginx.conf
View File

@ -75,6 +75,7 @@ server {
rewrite /vue/(.*) /$1; rewrite /vue/(.*) /$1;
} }
#try_files /vue/$uri /vue/$uri/ /index.html;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;