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 #267 from gradido/265-Disable-Settings-Activities

Browse Source 
remove links to not work
This commit is contained in:
Ulf Gebhardt 2021-04-30 12:13:47 +02:00 committed by GitHub
commit 23abf89636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/src/routes/routes.js
View File

@ -21,20 +21,20 @@ const routes = [
requiresAuth: true, requiresAuth: true,
}, },
}, },
{ //{
path: '/profileedit', // path: '/profileedit',
component: () => import('../views/Pages/UserProfileEdit.vue'), // component: () => import('../views/Pages/UserProfileEdit.vue'),
meta: { // meta: {
requiresAuth: true, // requiresAuth: true,
}, // },
}, //},
{ //{
path: '/activity', // path: '/activity',
component: () => import('../views/Pages/UserProfileActivity.vue'), // component: () => import('../views/Pages/UserProfileActivity.vue'),
meta: { // meta: {
requiresAuth: true, // requiresAuth: true,
}, // },
}, //},
{ {
path: '/transactions', path: '/transactions',
component: () => import('../views/Pages/UserProfileTransactionList.vue'), component: () => import('../views/Pages/UserProfileTransactionList.vue'),

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

@ -79,7 +79,7 @@ describe('DashboardLayoutGdd', () => {
}) })
it('has five items in the navbar', () => { it('has five items in the navbar', () => {
expect(navbar.findAll('ul > li')).toHaveLength(5) expect(navbar.findAll('ul > li')).toHaveLength(3)
}) })
it('has first item "send" in navbar', () => { it('has first item "send" in navbar', () => {
@ -116,29 +116,29 @@ describe('DashboardLayoutGdd', () => {
expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profile') expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profile')
}) })
it('has fourth item "Settigs" in navbar', () => { //it('has fourth item "Settigs" in navbar', () => {
expect(navbar.findAll('ul > li').at(3).text()).toEqual('site.navbar.settings') // expect(navbar.findAll('ul > li').at(3).text()).toEqual('site.navbar.settings')
}) //})
//
//it.skip('has fourth item "Settings" linked to profileedit in navbar', async () => {
// navbar.findAll('ul > li > a').at(3).trigger('click')
// await flushPromises()
// await jest.runAllTimers()
// await flushPromises()
// expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profileedit')
//})
it.skip('has fourth item "Settings" linked to profileedit in navbar', async () => { //it('has fifth item "Activity" in navbar', () => {
navbar.findAll('ul > li > a').at(3).trigger('click') // expect(navbar.findAll('ul > li').at(4).text()).toEqual('site.navbar.activity')
await flushPromises() //})
await jest.runAllTimers() //
await flushPromises() //it.skip('has fourth item "Activity" linked to activity in navbar', async () => {
expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/profileedit') // navbar.findAll('ul > li > a').at(4).trigger('click')
}) // await flushPromises()
// await jest.runAllTimers()
it('has fifth item "Activity" in navbar', () => { // await flushPromises()
expect(navbar.findAll('ul > li').at(4).text()).toEqual('site.navbar.activity') // expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/activity')
}) //})
it.skip('has fourth item "Activity" linked to activity in navbar', async () => {
navbar.findAll('ul > li > a').at(4).trigger('click')
await flushPromises()
await jest.runAllTimers()
await flushPromises()
expect(wrapper.findComponent(RouterLinkStub).props().to).toBe('/activity')
})
}) })
}) })
}) })

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

@ -12,12 +12,14 @@
<b-nav-item href="#!" to="/profile"> <b-nav-item href="#!" to="/profile">
<b-nav-text class="p-0 text-lg text-muted">{{ $t('site.navbar.my-profil') }}</b-nav-text> <b-nav-text class="p-0 text-lg text-muted">{{ $t('site.navbar.my-profil') }}</b-nav-text>
</b-nav-item> </b-nav-item>
<!--
<b-nav-item href="#!" to="/profileedit"> <b-nav-item href="#!" to="/profileedit">
<b-nav-text class="p-0 text-lg text-muted">{{ $t('site.navbar.settings') }}</b-nav-text> <b-nav-text class="p-0 text-lg text-muted">{{ $t('site.navbar.settings') }}</b-nav-text>
</b-nav-item> </b-nav-item>
<b-nav-item href="#!" to="/activity"> <b-nav-item href="#!" to="/activity">
<b-nav-text class="p-0 text-lg text-muted">{{ $t('site.navbar.activity') }}</b-nav-text> <b-nav-text class="p-0 text-lg text-muted">{{ $t('site.navbar.activity') }}</b-nav-text>
</b-nav-item> </b-nav-item>
-->
</template> </template>
</side-bar> </side-bar>
<div class="main-content"> <div class="main-content">