diff --git a/admin/src/components/AiChat.vue b/admin/src/components/AiChat.vue index bdfbef28c..f7cf6b2dd 100644 --- a/admin/src/components/AiChat.vue +++ b/admin/src/components/AiChat.vue @@ -29,7 +29,7 @@ :title="$t('copy-to-clipboard')" @click="copyToClipboard(message.content)" > - + diff --git a/frontend/src/components/Breadcrumb/breadcrumb.vue b/frontend/src/components/Breadcrumb/breadcrumb.vue index 305b34fe7..7372ecc6e 100644 --- a/frontend/src/components/Breadcrumb/breadcrumb.vue +++ b/frontend/src/components/Breadcrumb/breadcrumb.vue @@ -23,4 +23,10 @@ export default { margin-bottom: 1rem; padding: 0.75rem 1rem; } + +@media screen and (width <= 450px) { + .page-breadcrumb { + margin-top: 3rem; + } +} diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js index cc26d2880..150524629 100644 --- a/frontend/src/components/Menu/Navbar.spec.js +++ b/frontend/src/components/Menu/Navbar.spec.js @@ -5,6 +5,8 @@ import { createStore } from 'vuex' import Navbar from './Navbar.vue' import { BImg, BNavbar, BNavbarBrand, BNavbarNav } from 'bootstrap-vue-next' import AppAvatar from '@/components/AppAvatar.vue' +import { createI18n } from 'vue-i18n' +import CONFIG from '@/config' // Mock vue-avatar vi.mock('vue-avatar', () => ({ @@ -17,6 +19,16 @@ vi.mock('vue-avatar', () => ({ }, })) +const i18n = createI18n({ + legacy: false, + locale: 'en', + messages: { + en: { + 'copied-to-clipboard': 'copied-to-clipboard', + }, + }, +}) + const createVuexStore = (state = {}) => createStore({ state: () => ({ @@ -24,6 +36,7 @@ const createVuexStore = (state = {}) => lastName: 'User', gradidoID: 'current-user-id', email: 'test@example.com', + username: 'username', ...state, }), }) @@ -41,7 +54,10 @@ describe('Navbar', () => { store = createVuexStore(storeState) return mount(Navbar, { global: { - plugins: [store, router], + plugins: [store, router, i18n], + stubs: { + IBiClipboard: true, + }, mocks: { $t: (msg) => msg, }, @@ -89,7 +105,9 @@ describe('Navbar', () => { }) it('has the email address', () => { - expect(wrapper.find('div[data-test="navbar-item-email"]').text()).toBe('test@example.com') + expect(wrapper.find('div[data-test="navbar-item-gradido-id"]').text()).toBe( + `${CONFIG.COMMUNITY_NAME}/username`, + ) }) }) }) diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 958405b45..1bee25e5d 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -3,12 +3,14 @@