From d3b4a576c80827e3efbd9a64d2d68053ec091528 Mon Sep 17 00:00:00 2001 From: Anthony LC Date: Thu, 18 Apr 2024 12:09:26 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F(app-impress)=20clean=20th?= =?UTF-8?q?e=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - replace pad and template icon - remove unused icons - remove unused pages - remove menu items --- .../e2e/__tests__/app-impress/menu.spec.ts | 6 +----- .../__tests__/app-impress/pad-editor.spec.ts | 2 +- .../apps/impress/src/features/menu/Menu.tsx | 12 ++--------- .../src/features/menu/assets/icon-clock.svg | 8 -------- .../features/menu/assets/icon-contacts.svg | 13 ------------ .../src/features/menu/assets/icon-pad.svg | 20 +++++++++++++++++++ .../src/features/menu/assets/icon-search.svg | 13 ------------ .../src/features/menu/assets/icon-stars.svg | 13 ------------ .../features/menu/assets/icon-template.svg | 20 ++++++++++++++++--- .../apps/impress/src/pages/contacts/index.tsx | 15 -------------- .../apps/impress/src/pages/favorite/index.tsx | 15 -------------- .../apps/impress/src/pages/groups/index.tsx | 15 -------------- .../apps/impress/src/pages/recent/index.tsx | 15 -------------- 13 files changed, 41 insertions(+), 126 deletions(-) delete mode 100644 src/frontend/apps/impress/src/features/menu/assets/icon-clock.svg delete mode 100644 src/frontend/apps/impress/src/features/menu/assets/icon-contacts.svg create mode 100644 src/frontend/apps/impress/src/features/menu/assets/icon-pad.svg delete mode 100644 src/frontend/apps/impress/src/features/menu/assets/icon-search.svg delete mode 100644 src/frontend/apps/impress/src/features/menu/assets/icon-stars.svg delete mode 100644 src/frontend/apps/impress/src/pages/contacts/index.tsx delete mode 100644 src/frontend/apps/impress/src/pages/favorite/index.tsx delete mode 100644 src/frontend/apps/impress/src/pages/groups/index.tsx delete mode 100644 src/frontend/apps/impress/src/pages/recent/index.tsx diff --git a/src/frontend/apps/e2e/__tests__/app-impress/menu.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/menu.spec.ts index 1eafa55a..9a2dcaee 100644 --- a/src/frontend/apps/e2e/__tests__/app-impress/menu.spec.ts +++ b/src/frontend/apps/e2e/__tests__/app-impress/menu.spec.ts @@ -9,12 +9,8 @@ test.beforeEach(async ({ page, browserName }) => { test.describe('Menu', () => { const menuItems = [ - { name: 'Search', isDefault: true }, + { name: 'Pad', isDefault: true }, { name: 'Template', isDefault: false }, - { name: 'Favorite', isDefault: false }, - { name: 'Recent', isDefault: false }, - { name: 'Contacts', isDefault: false }, - { name: 'Groups', isDefault: false }, ]; for (const { name, isDefault } of menuItems) { test(`checks that ${name} menu item is displaying correctly`, async ({ diff --git a/src/frontend/apps/e2e/__tests__/app-impress/pad-editor.spec.ts b/src/frontend/apps/e2e/__tests__/app-impress/pad-editor.spec.ts index 0fee2b18..39aef31b 100644 --- a/src/frontend/apps/e2e/__tests__/app-impress/pad-editor.spec.ts +++ b/src/frontend/apps/e2e/__tests__/app-impress/pad-editor.spec.ts @@ -112,7 +112,7 @@ test.describe('Pad Editor', () => { await page.getByText('Save template').click(); const menu = page.locator('menu').first(); - await menu.getByLabel(`Search button`).click(); + await menu.getByLabel(`Pad button`).click(); const randomPad = await createPad(page, 'pad-editor', browserName, 1); await expect(page.locator('h2').getByText(randomPad[0])).toBeVisible(); diff --git a/src/frontend/apps/impress/src/features/menu/Menu.tsx b/src/frontend/apps/impress/src/features/menu/Menu.tsx index 571c7304..f0a633c1 100644 --- a/src/frontend/apps/impress/src/features/menu/Menu.tsx +++ b/src/frontend/apps/impress/src/features/menu/Menu.tsx @@ -1,15 +1,11 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; -import IconGroup from '@/assets/icons/icon-group.svg'; 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 IconSearch from './assets/icon-search.svg'; -import IconFavorite from './assets/icon-stars.svg'; +import IconPad from './assets/icon-pad.svg'; import IconTemplate from './assets/icon-template.svg'; export const Menu = () => { @@ -25,12 +21,8 @@ export const Menu = () => { $justify="space-between" > - + - - - - ); diff --git a/src/frontend/apps/impress/src/features/menu/assets/icon-clock.svg b/src/frontend/apps/impress/src/features/menu/assets/icon-clock.svg deleted file mode 100644 index bd375f2e..00000000 --- a/src/frontend/apps/impress/src/features/menu/assets/icon-clock.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - diff --git a/src/frontend/apps/impress/src/features/menu/assets/icon-contacts.svg b/src/frontend/apps/impress/src/features/menu/assets/icon-contacts.svg deleted file mode 100644 index 2924525a..00000000 --- a/src/frontend/apps/impress/src/features/menu/assets/icon-contacts.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/src/frontend/apps/impress/src/features/menu/assets/icon-pad.svg b/src/frontend/apps/impress/src/features/menu/assets/icon-pad.svg new file mode 100644 index 00000000..4ba7bd62 --- /dev/null +++ b/src/frontend/apps/impress/src/features/menu/assets/icon-pad.svg @@ -0,0 +1,20 @@ + + + + + diff --git a/src/frontend/apps/impress/src/features/menu/assets/icon-search.svg b/src/frontend/apps/impress/src/features/menu/assets/icon-search.svg deleted file mode 100644 index 21e24448..00000000 --- a/src/frontend/apps/impress/src/features/menu/assets/icon-search.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/src/frontend/apps/impress/src/features/menu/assets/icon-stars.svg b/src/frontend/apps/impress/src/features/menu/assets/icon-stars.svg deleted file mode 100644 index 8de14956..00000000 --- a/src/frontend/apps/impress/src/features/menu/assets/icon-stars.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/src/frontend/apps/impress/src/features/menu/assets/icon-template.svg b/src/frontend/apps/impress/src/features/menu/assets/icon-template.svg index 1871d9c4..f7b184d7 100644 --- a/src/frontend/apps/impress/src/features/menu/assets/icon-template.svg +++ b/src/frontend/apps/impress/src/features/menu/assets/icon-template.svg @@ -1,6 +1,20 @@ - + + /> + + diff --git a/src/frontend/apps/impress/src/pages/contacts/index.tsx b/src/frontend/apps/impress/src/pages/contacts/index.tsx deleted file mode 100644 index a46ea5b0..00000000 --- a/src/frontend/apps/impress/src/pages/contacts/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { ReactElement } from 'react'; - -import { Box } from '@/components'; -import { MainLayout } from '@/layouts'; -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/impress/src/pages/favorite/index.tsx b/src/frontend/apps/impress/src/pages/favorite/index.tsx deleted file mode 100644 index 4528f0cb..00000000 --- a/src/frontend/apps/impress/src/pages/favorite/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { ReactElement } from 'react'; - -import { Box } from '@/components'; -import { MainLayout } from '@/layouts'; -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/impress/src/pages/groups/index.tsx b/src/frontend/apps/impress/src/pages/groups/index.tsx deleted file mode 100644 index de5c36db..00000000 --- a/src/frontend/apps/impress/src/pages/groups/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { ReactElement } from 'react'; - -import { Box } from '@/components'; -import { MainLayout } from '@/layouts'; -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/impress/src/pages/recent/index.tsx b/src/frontend/apps/impress/src/pages/recent/index.tsx deleted file mode 100644 index 508fd537..00000000 --- a/src/frontend/apps/impress/src/pages/recent/index.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { ReactElement } from 'react'; - -import { Box } from '@/components'; -import { MainLayout } from '@/layouts'; -import { NextPageWithLayout } from '@/types/next'; - -const Page: NextPageWithLayout = () => { - return Recent; -}; - -Page.getLayout = function getLayout(page: ReactElement) { - return {page}; -}; - -export default Page;