diff --git a/src/frontend/apps/desk/public/favicon.ico b/src/frontend/apps/desk/public/favicon.ico index 718d6fe..a2c76f6 100644 Binary files a/src/frontend/apps/desk/public/favicon.ico and b/src/frontend/apps/desk/public/favicon.ico differ diff --git a/src/frontend/apps/desk/src/features/header/Header.tsx b/src/frontend/apps/desk/src/features/header/Header.tsx index 23fcaf8..cf648ac 100644 --- a/src/frontend/apps/desk/src/features/header/Header.tsx +++ b/src/frontend/apps/desk/src/features/header/Header.tsx @@ -8,7 +8,7 @@ import { ApplicationsMenu } from '@/features/header/ApplicationsMenu'; import { LanguagePicker } from '../language/'; -import { default as IconDesk } from './assets/icon-desk.svg?url'; +import { default as IconApplication } from './assets/icon-application.svg?url'; import { default as IconGouv } from './assets/icon-gouv.svg?url'; import { default as IconMarianne } from './assets/icon-marianne.svg?url'; import IconMyAccount from './assets/icon-my-account.png'; @@ -55,9 +55,9 @@ export const Header = () => { alt={t('Freedom Equality Fraternity Logo')} /> - {t('Desk + {t('Equipes - {t('Desk')} + {t('Equipes')} diff --git a/src/frontend/apps/desk/src/features/header/assets/icon-application.svg b/src/frontend/apps/desk/src/features/header/assets/icon-application.svg new file mode 100644 index 0000000..ffdfa2c --- /dev/null +++ b/src/frontend/apps/desk/src/features/header/assets/icon-application.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/frontend/apps/desk/src/features/header/assets/icon-desk.svg b/src/frontend/apps/desk/src/features/header/assets/icon-desk.svg deleted file mode 100644 index 971d942..0000000 --- a/src/frontend/apps/desk/src/features/header/assets/icon-desk.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/src/frontend/apps/desk/src/i18n/translations.json b/src/frontend/apps/desk/src/i18n/translations.json index 18bf2be..961a528 100644 --- a/src/frontend/apps/desk/src/i18n/translations.json +++ b/src/frontend/apps/desk/src/i18n/translations.json @@ -36,11 +36,13 @@ "Created at": "Créé le", "Delete the team": "Supprimer le groupe", "Deleting the {{teamName}} team": "Suppression du groupe {{teamName}}", - "Desk": "Desk", - "Desk Logo": "Logo Desk", "Emails": "Emails", "Empty teams icon": "Icône de groupe vide", "Enter the new name of the selected team": "Entrez le nouveau nom du groupe sélectionné", + "Equipes": "Equipes", + "Equipes Description": "Description de Equipes", + "Equipes Logo": "Equipes Logo", + "Error occurred while logging out": "La déconnexion a échoué", "Failed to add {{name}} in the team": "Impossible d'ajouter {{name}} au groupe", "Failed to create the invitation for {{email}}": "Impossible de créer l'invitation pour {{email}}", "Favorite": "Favoris", @@ -67,8 +69,6 @@ "Open the team options": "Ouvrir les options de groupe", "Ouch !": "Ooops !", "Owner": "Propriétaire", - "People": "People", - "People Description": "Description de People", "Profile picture": "Photo du profil", "Radio buttons to update the roles": "Boutons radio pour mettre à jour les rôles", "Recent": "Récent", diff --git a/src/frontend/apps/desk/src/pages/_app.tsx b/src/frontend/apps/desk/src/pages/_app.tsx index 0d2ea15..60307f3 100644 --- a/src/frontend/apps/desk/src/pages/_app.tsx +++ b/src/frontend/apps/desk/src/pages/_app.tsx @@ -18,8 +18,8 @@ export default function App({ Component, pageProps }: AppPropsWithLayout) { return ( <> - {t('People')} - + {t('Equipes')} + {getLayout()} diff --git a/src/frontend/apps/e2e/__tests__/app-desk/header.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/header.spec.ts index 3733b78..67d7253 100644 --- a/src/frontend/apps/e2e/__tests__/app-desk/header.spec.ts +++ b/src/frontend/apps/e2e/__tests__/app-desk/header.spec.ts @@ -17,12 +17,12 @@ test.describe('Header', () => { header.getByAltText('Freedom Equality Fraternity Logo'), ).toBeVisible(); - await expect(header.getByAltText('Desk Logo')).toBeVisible(); - await expect(header.locator('h2').getByText('Desk')).toHaveCSS( + await expect(header.getByAltText('Equipes Logo')).toBeVisible(); + await expect(header.locator('h2').getByText('Equipes')).toHaveCSS( 'color', 'rgb(0, 0, 145)', ); - await expect(header.locator('h2').getByText('Desk')).toHaveCSS( + await expect(header.locator('h2').getByText('Equipes')).toHaveCSS( 'font-family', /Marianne/i, ); @@ -32,12 +32,6 @@ test.describe('Header', () => { ).toBeVisible(); await expect(header.getByAltText('Language Icon')).toBeVisible(); - - await expect(header.getByText('John Doe')).toBeVisible(); - await expect( - header.getByRole('img', { - name: 'profile picture', - }), - ).toBeVisible(); + await expect(header.getByText('My account')).toBeVisible(); }); });