diff --git a/src/frontend/apps/desk/src/features/menu/Menu.tsx b/src/frontend/apps/desk/src/features/menu/Menu.tsx index 7fdd1d9..c6a5de9 100644 --- a/src/frontend/apps/desk/src/features/menu/Menu.tsx +++ b/src/frontend/apps/desk/src/features/menu/Menu.tsx @@ -6,11 +6,7 @@ import { Box } from '@/components/'; import useCunninghamTheme from '@/cunningham/useCunninghamTheme'; import MenuItem from './MenuItems'; -import IconRecent from './assets/icon-clock.svg'; -import IconContacts from './assets/icon-contacts.svg'; import IconMail from './assets/icon-mails.svg'; -import IconSearch from './assets/icon-search.svg'; -import IconFavorite from './assets/icon-stars.svg'; export const Menu = () => { const { colorsTokens } = useCunninghamTheme(); @@ -26,12 +22,8 @@ export const Menu = () => { $margin="none" > - + - - - - ); diff --git a/src/frontend/apps/desk/src/features/menu/assets/icon-clock.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-clock.svg deleted file mode 100644 index bd375f2..0000000 --- a/src/frontend/apps/desk/src/features/menu/assets/icon-clock.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/src/frontend/apps/desk/src/features/menu/assets/icon-contacts.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-contacts.svg deleted file mode 100644 index 2924525..0000000 --- a/src/frontend/apps/desk/src/features/menu/assets/icon-contacts.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/src/frontend/apps/desk/src/features/menu/assets/icon-search.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-search.svg deleted file mode 100644 index 21e2444..0000000 --- a/src/frontend/apps/desk/src/features/menu/assets/icon-search.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/src/frontend/apps/desk/src/features/menu/assets/icon-stars.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-stars.svg deleted file mode 100644 index 8de1495..0000000 --- a/src/frontend/apps/desk/src/features/menu/assets/icon-stars.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/src/frontend/apps/desk/src/pages/contacts/index.tsx b/src/frontend/apps/desk/src/pages/contacts/index.tsx deleted file mode 100644 index ba88d4f..0000000 --- a/src/frontend/apps/desk/src/pages/contacts/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { ReactElement } from 'react'; - -import { Box } from '@/components'; -import { MainLayout } from '@/core'; -import { NextPageWithLayout } from '@/types/next'; - -const Page: NextPageWithLayout = () => { - return Contacts; -}; - -Page.getLayout = function getLayout(page: ReactElement) { - return {page}; -}; - -export default Page; diff --git a/src/frontend/apps/desk/src/pages/favorite/index.tsx b/src/frontend/apps/desk/src/pages/favorite/index.tsx deleted file mode 100644 index 7b81c2b..0000000 --- a/src/frontend/apps/desk/src/pages/favorite/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { ReactElement } from 'react'; - -import { Box } from '@/components'; -import { MainLayout } from '@/core'; -import { NextPageWithLayout } from '@/types/next'; - -const Page: NextPageWithLayout = () => { - return Favorite; -}; - -Page.getLayout = function getLayout(page: ReactElement) { - return {page}; -}; - -export default Page; diff --git a/src/frontend/apps/desk/src/pages/groups/index.tsx b/src/frontend/apps/desk/src/pages/groups/index.tsx deleted file mode 100644 index c24c053..0000000 --- a/src/frontend/apps/desk/src/pages/groups/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { ReactElement } from 'react'; - -import { Box } from '@/components'; -import { MainLayout } from '@/core'; -import { NextPageWithLayout } from '@/types/next'; - -const Page: NextPageWithLayout = () => { - return Groups; -}; - -Page.getLayout = function getLayout(page: ReactElement) { - return {page}; -}; - -export default Page; diff --git a/src/frontend/apps/desk/src/pages/recent/index.tsx b/src/frontend/apps/desk/src/pages/recent/index.tsx deleted file mode 100644 index cb06667..0000000 --- a/src/frontend/apps/desk/src/pages/recent/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { ReactElement } from 'react'; - -import { Box } from '@/components'; -import { MainLayout } from '@/core/'; -import { NextPageWithLayout } from '@/types/next'; - -const Page: NextPageWithLayout = () => { - return Recent; -}; - -Page.getLayout = function getLayout(page: ReactElement) { - return {page}; -}; - -export default Page; diff --git a/src/frontend/apps/e2e/__tests__/app-desk/menu.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/menu.spec.ts index 7df5a58..32fc9db 100644 --- a/src/frontend/apps/e2e/__tests__/app-desk/menu.spec.ts +++ b/src/frontend/apps/e2e/__tests__/app-desk/menu.spec.ts @@ -9,14 +9,20 @@ test.beforeEach(async ({ page, browserName }) => { test.describe('Menu', () => { const menuItems = [ - { name: 'Search', isDefault: true }, - { name: 'Mails', isDefault: false }, - { name: 'Favorite', isDefault: false }, - { name: 'Recent', isDefault: false }, - { name: 'Contacts', isDefault: false }, - { name: 'Groups', isDefault: false }, + { + name: 'Teams', + isDefault: true, + expectedUrl: '', + expectedText: 'Create a new team', + }, + { + name: 'Mails', + isDefault: false, + expectedUrl: '/mails', + expectedText: 'Emails', + }, ]; - for (const { name, isDefault } of menuItems) { + for (const { name, isDefault, expectedUrl, expectedText } of menuItems) { test(`checks that ${name} menu item is displaying correctly`, async ({ page, }) => { @@ -46,37 +52,13 @@ test.describe('Menu', () => { test(`checks that ${name} menu item is routing correctly`, async ({ page, }) => { - await expect( - page.getByRole('button', { - name: 'Create a new team', - }), - ).toBeVisible(); - const menu = page.locator('menu').first(); const buttonMenu = menu.getByLabel(`${name} button`); await buttonMenu.click(); - /* eslint-disable playwright/no-conditional-expect */ - /* eslint-disable playwright/no-conditional-in-test */ - if (isDefault) { - await expect( - page.getByRole('button', { - name: 'Create a new team', - }), - ).toBeVisible(); - } else { - await expect( - page.getByRole('button', { - name: 'Create a new team', - }), - ).toBeHidden(); - - const reg = new RegExp(name.toLowerCase()); - await expect(page).toHaveURL(reg); - } - /* eslint-enable playwright/no-conditional-expect */ - /* eslint-enable playwright/no-conditional-in-test */ + await expect(page.getByText(expectedText).first()).toBeVisible(); + await expect(page).toHaveURL(expectedUrl); }); } });