From 0b703cda97f7445992d47ae01c4aa3643edc29ef Mon Sep 17 00:00:00 2001 From: Anthony LC Date: Tue, 30 Jan 2024 16:11:02 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A(app-desk)=20move=20features=20to?= =?UTF-8?q?=20features=20folder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The features were in the app folder, app folder is where Next uses his router system. To avoid confusion between the folder router and the features, we export the features in a feature folder. --- .../desk/src/app/Header/assets/icon-cells.svg | 10 --- .../desk/src/app/Header/assets/icon-desk.svg | 5 -- .../desk/src/app/Header/assets/icon-faq.svg | 3 - .../desk/src/app/Header/assets/icon-gouv.svg | 6 -- .../src/app/Header/assets/icon-marianne.svg | 8 --- .../apps/desk/src/app/InnerLayout.tsx | 5 +- .../src/app/Language/assets/icon-language.svg | 3 - src/frontend/apps/desk/src/app/page.tsx | 3 +- .../Header => features/header}/Header.tsx | 8 +-- .../src/features/header/assets/icon-cells.svg | 61 +++++++++++++++++++ .../src/features/header/assets/icon-desk.svg | 22 +++++++ .../src/features/header/assets/icon-faq.svg | 14 +++++ .../src/features/header/assets/icon-gouv.svg | 30 +++++++++ .../features/header/assets/icon-marianne.svg | 31 ++++++++++ .../apps/desk/src/features/header/index.ts | 1 + src/frontend/apps/desk/src/features/index.ts | 4 ++ .../language}/LanguagePicker.tsx | 0 .../language/assets/icon-language.svg | 14 +++++ .../Language => features/language}/index.ts | 0 .../desk/src/{app => features}/menu/Menu.tsx | 0 .../src/{app => features}/menu/MenuItems.tsx | 0 .../src/{app => features}/menu/Tooltip.tsx | 0 .../menu/assets/icon-clock.svg | 0 .../menu/assets/icon-contacts.svg | 0 .../menu/assets/icon-group.svg | 0 .../menu/assets/icon-search.svg | 0 .../menu/assets/icon-stars.svg | 0 .../desk/src/{app => features}/menu/index.ts | 0 .../teams}/__tests__/teams.test.tsx | 0 .../teams}/api/useCreateTeam.tsx | 0 .../Teams => features/teams}/api/useTeams.tsx | 0 .../{app/Teams => features/teams}/index.tsx | 0 32 files changed, 183 insertions(+), 45 deletions(-) delete mode 100644 src/frontend/apps/desk/src/app/Header/assets/icon-cells.svg delete mode 100644 src/frontend/apps/desk/src/app/Header/assets/icon-desk.svg delete mode 100644 src/frontend/apps/desk/src/app/Header/assets/icon-faq.svg delete mode 100644 src/frontend/apps/desk/src/app/Header/assets/icon-gouv.svg delete mode 100644 src/frontend/apps/desk/src/app/Header/assets/icon-marianne.svg delete mode 100644 src/frontend/apps/desk/src/app/Language/assets/icon-language.svg rename src/frontend/apps/desk/src/{app/Header => features/header}/Header.tsx (94%) create mode 100644 src/frontend/apps/desk/src/features/header/assets/icon-cells.svg create mode 100644 src/frontend/apps/desk/src/features/header/assets/icon-desk.svg create mode 100644 src/frontend/apps/desk/src/features/header/assets/icon-faq.svg create mode 100644 src/frontend/apps/desk/src/features/header/assets/icon-gouv.svg create mode 100644 src/frontend/apps/desk/src/features/header/assets/icon-marianne.svg create mode 100644 src/frontend/apps/desk/src/features/header/index.ts create mode 100644 src/frontend/apps/desk/src/features/index.ts rename src/frontend/apps/desk/src/{app/Language => features/language}/LanguagePicker.tsx (100%) create mode 100644 src/frontend/apps/desk/src/features/language/assets/icon-language.svg rename src/frontend/apps/desk/src/{app/Language => features/language}/index.ts (100%) rename src/frontend/apps/desk/src/{app => features}/menu/Menu.tsx (100%) rename src/frontend/apps/desk/src/{app => features}/menu/MenuItems.tsx (100%) rename src/frontend/apps/desk/src/{app => features}/menu/Tooltip.tsx (100%) rename src/frontend/apps/desk/src/{app => features}/menu/assets/icon-clock.svg (100%) rename src/frontend/apps/desk/src/{app => features}/menu/assets/icon-contacts.svg (100%) rename src/frontend/apps/desk/src/{app => features}/menu/assets/icon-group.svg (100%) rename src/frontend/apps/desk/src/{app => features}/menu/assets/icon-search.svg (100%) rename src/frontend/apps/desk/src/{app => features}/menu/assets/icon-stars.svg (100%) rename src/frontend/apps/desk/src/{app => features}/menu/index.ts (100%) rename src/frontend/apps/desk/src/{app/Teams => features/teams}/__tests__/teams.test.tsx (100%) rename src/frontend/apps/desk/src/{app/Teams => features/teams}/api/useCreateTeam.tsx (100%) rename src/frontend/apps/desk/src/{app/Teams => features/teams}/api/useTeams.tsx (100%) rename src/frontend/apps/desk/src/{app/Teams => features/teams}/index.tsx (100%) diff --git a/src/frontend/apps/desk/src/app/Header/assets/icon-cells.svg b/src/frontend/apps/desk/src/app/Header/assets/icon-cells.svg deleted file mode 100644 index 64358cdae..000000000 --- a/src/frontend/apps/desk/src/app/Header/assets/icon-cells.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/frontend/apps/desk/src/app/Header/assets/icon-desk.svg b/src/frontend/apps/desk/src/app/Header/assets/icon-desk.svg deleted file mode 100644 index 06dc733be..000000000 --- a/src/frontend/apps/desk/src/app/Header/assets/icon-desk.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/frontend/apps/desk/src/app/Header/assets/icon-faq.svg b/src/frontend/apps/desk/src/app/Header/assets/icon-faq.svg deleted file mode 100644 index acd989a39..000000000 --- a/src/frontend/apps/desk/src/app/Header/assets/icon-faq.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/frontend/apps/desk/src/app/Header/assets/icon-gouv.svg b/src/frontend/apps/desk/src/app/Header/assets/icon-gouv.svg deleted file mode 100644 index b7445f009..000000000 --- a/src/frontend/apps/desk/src/app/Header/assets/icon-gouv.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/frontend/apps/desk/src/app/Header/assets/icon-marianne.svg b/src/frontend/apps/desk/src/app/Header/assets/icon-marianne.svg deleted file mode 100644 index 11c474343..000000000 --- a/src/frontend/apps/desk/src/app/Header/assets/icon-marianne.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/frontend/apps/desk/src/app/InnerLayout.tsx b/src/frontend/apps/desk/src/app/InnerLayout.tsx index 15dfbf93a..6a949ee4e 100644 --- a/src/frontend/apps/desk/src/app/InnerLayout.tsx +++ b/src/frontend/apps/desk/src/app/InnerLayout.tsx @@ -3,9 +3,8 @@ import { useEffect } from 'react'; import useAuthStore from '@/auth/useAuthStore'; import { Box } from '@/components'; - -import { HEADER_HEIGHT, Header } from './header'; -import { Menu } from './menu'; +import { HEADER_HEIGHT, Header } from '@/features/header'; +import { Menu } from '@/features/menu'; export default function InnerLayout({ children, diff --git a/src/frontend/apps/desk/src/app/Language/assets/icon-language.svg b/src/frontend/apps/desk/src/app/Language/assets/icon-language.svg deleted file mode 100644 index c9fac0691..000000000 --- a/src/frontend/apps/desk/src/app/Language/assets/icon-language.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/frontend/apps/desk/src/app/page.tsx b/src/frontend/apps/desk/src/app/page.tsx index 785672d3b..8481a1a64 100644 --- a/src/frontend/apps/desk/src/app/page.tsx +++ b/src/frontend/apps/desk/src/app/page.tsx @@ -3,8 +3,7 @@ import { useTranslation } from 'react-i18next'; import { Box } from '@/components'; - -import { Teams } from './Teams'; +import { Teams } from '@/features'; export default function Home() { const { t } = useTranslation(); diff --git a/src/frontend/apps/desk/src/app/Header/Header.tsx b/src/frontend/apps/desk/src/features/header/Header.tsx similarity index 94% rename from src/frontend/apps/desk/src/app/Header/Header.tsx rename to src/frontend/apps/desk/src/features/header/Header.tsx index 2a1cc68bf..5e5eb69bf 100644 --- a/src/frontend/apps/desk/src/app/Header/Header.tsx +++ b/src/frontend/apps/desk/src/features/header/Header.tsx @@ -6,7 +6,7 @@ import styled from 'styled-components'; import { Box, Text } from '@/components/'; -import { LanguagePicker } from '../Language/'; +import { LanguagePicker } from '../language/'; import { default as IconCells } from './assets/icon-cells.svg?url'; import { default as IconDesk } from './assets/icon-desk.svg?url'; @@ -36,13 +36,13 @@ const StyledHeader = styled.header` z-index: 100; `; -const Header = () => { +export const Header = () => { const { t } = useTranslation(); return ( - + {t('Marianne @@ -103,5 +103,3 @@ const Header = () => { ); }; - -export default Header; diff --git a/src/frontend/apps/desk/src/features/header/assets/icon-cells.svg b/src/frontend/apps/desk/src/features/header/assets/icon-cells.svg new file mode 100644 index 000000000..15329758c --- /dev/null +++ b/src/frontend/apps/desk/src/features/header/assets/icon-cells.svg @@ -0,0 +1,61 @@ + + + + + + + + + + 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 new file mode 100644 index 000000000..971d94214 --- /dev/null +++ b/src/frontend/apps/desk/src/features/header/assets/icon-desk.svg @@ -0,0 +1,22 @@ + + + + + diff --git a/src/frontend/apps/desk/src/features/header/assets/icon-faq.svg b/src/frontend/apps/desk/src/features/header/assets/icon-faq.svg new file mode 100644 index 000000000..81db059cb --- /dev/null +++ b/src/frontend/apps/desk/src/features/header/assets/icon-faq.svg @@ -0,0 +1,14 @@ + + + diff --git a/src/frontend/apps/desk/src/features/header/assets/icon-gouv.svg b/src/frontend/apps/desk/src/features/header/assets/icon-gouv.svg new file mode 100644 index 000000000..5cce8b51a --- /dev/null +++ b/src/frontend/apps/desk/src/features/header/assets/icon-gouv.svg @@ -0,0 +1,30 @@ + + + + + + diff --git a/src/frontend/apps/desk/src/features/header/assets/icon-marianne.svg b/src/frontend/apps/desk/src/features/header/assets/icon-marianne.svg new file mode 100644 index 000000000..3b0136e62 --- /dev/null +++ b/src/frontend/apps/desk/src/features/header/assets/icon-marianne.svg @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/src/frontend/apps/desk/src/features/header/index.ts b/src/frontend/apps/desk/src/features/header/index.ts new file mode 100644 index 000000000..266dec8a1 --- /dev/null +++ b/src/frontend/apps/desk/src/features/header/index.ts @@ -0,0 +1 @@ +export * from './Header'; diff --git a/src/frontend/apps/desk/src/features/index.ts b/src/frontend/apps/desk/src/features/index.ts new file mode 100644 index 000000000..505826054 --- /dev/null +++ b/src/frontend/apps/desk/src/features/index.ts @@ -0,0 +1,4 @@ +export * from './header/'; +export * from './language/'; +export * from './menu/'; +export * from './teams/'; diff --git a/src/frontend/apps/desk/src/app/Language/LanguagePicker.tsx b/src/frontend/apps/desk/src/features/language/LanguagePicker.tsx similarity index 100% rename from src/frontend/apps/desk/src/app/Language/LanguagePicker.tsx rename to src/frontend/apps/desk/src/features/language/LanguagePicker.tsx diff --git a/src/frontend/apps/desk/src/features/language/assets/icon-language.svg b/src/frontend/apps/desk/src/features/language/assets/icon-language.svg new file mode 100644 index 000000000..022f51bdc --- /dev/null +++ b/src/frontend/apps/desk/src/features/language/assets/icon-language.svg @@ -0,0 +1,14 @@ + + + diff --git a/src/frontend/apps/desk/src/app/Language/index.ts b/src/frontend/apps/desk/src/features/language/index.ts similarity index 100% rename from src/frontend/apps/desk/src/app/Language/index.ts rename to src/frontend/apps/desk/src/features/language/index.ts diff --git a/src/frontend/apps/desk/src/app/menu/Menu.tsx b/src/frontend/apps/desk/src/features/menu/Menu.tsx similarity index 100% rename from src/frontend/apps/desk/src/app/menu/Menu.tsx rename to src/frontend/apps/desk/src/features/menu/Menu.tsx diff --git a/src/frontend/apps/desk/src/app/menu/MenuItems.tsx b/src/frontend/apps/desk/src/features/menu/MenuItems.tsx similarity index 100% rename from src/frontend/apps/desk/src/app/menu/MenuItems.tsx rename to src/frontend/apps/desk/src/features/menu/MenuItems.tsx diff --git a/src/frontend/apps/desk/src/app/menu/Tooltip.tsx b/src/frontend/apps/desk/src/features/menu/Tooltip.tsx similarity index 100% rename from src/frontend/apps/desk/src/app/menu/Tooltip.tsx rename to src/frontend/apps/desk/src/features/menu/Tooltip.tsx diff --git a/src/frontend/apps/desk/src/app/menu/assets/icon-clock.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-clock.svg similarity index 100% rename from src/frontend/apps/desk/src/app/menu/assets/icon-clock.svg rename to src/frontend/apps/desk/src/features/menu/assets/icon-clock.svg diff --git a/src/frontend/apps/desk/src/app/menu/assets/icon-contacts.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-contacts.svg similarity index 100% rename from src/frontend/apps/desk/src/app/menu/assets/icon-contacts.svg rename to src/frontend/apps/desk/src/features/menu/assets/icon-contacts.svg diff --git a/src/frontend/apps/desk/src/app/menu/assets/icon-group.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-group.svg similarity index 100% rename from src/frontend/apps/desk/src/app/menu/assets/icon-group.svg rename to src/frontend/apps/desk/src/features/menu/assets/icon-group.svg diff --git a/src/frontend/apps/desk/src/app/menu/assets/icon-search.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-search.svg similarity index 100% rename from src/frontend/apps/desk/src/app/menu/assets/icon-search.svg rename to src/frontend/apps/desk/src/features/menu/assets/icon-search.svg diff --git a/src/frontend/apps/desk/src/app/menu/assets/icon-stars.svg b/src/frontend/apps/desk/src/features/menu/assets/icon-stars.svg similarity index 100% rename from src/frontend/apps/desk/src/app/menu/assets/icon-stars.svg rename to src/frontend/apps/desk/src/features/menu/assets/icon-stars.svg diff --git a/src/frontend/apps/desk/src/app/menu/index.ts b/src/frontend/apps/desk/src/features/menu/index.ts similarity index 100% rename from src/frontend/apps/desk/src/app/menu/index.ts rename to src/frontend/apps/desk/src/features/menu/index.ts diff --git a/src/frontend/apps/desk/src/app/Teams/__tests__/teams.test.tsx b/src/frontend/apps/desk/src/features/teams/__tests__/teams.test.tsx similarity index 100% rename from src/frontend/apps/desk/src/app/Teams/__tests__/teams.test.tsx rename to src/frontend/apps/desk/src/features/teams/__tests__/teams.test.tsx diff --git a/src/frontend/apps/desk/src/app/Teams/api/useCreateTeam.tsx b/src/frontend/apps/desk/src/features/teams/api/useCreateTeam.tsx similarity index 100% rename from src/frontend/apps/desk/src/app/Teams/api/useCreateTeam.tsx rename to src/frontend/apps/desk/src/features/teams/api/useCreateTeam.tsx diff --git a/src/frontend/apps/desk/src/app/Teams/api/useTeams.tsx b/src/frontend/apps/desk/src/features/teams/api/useTeams.tsx similarity index 100% rename from src/frontend/apps/desk/src/app/Teams/api/useTeams.tsx rename to src/frontend/apps/desk/src/features/teams/api/useTeams.tsx diff --git a/src/frontend/apps/desk/src/app/Teams/index.tsx b/src/frontend/apps/desk/src/features/teams/index.tsx similarity index 100% rename from src/frontend/apps/desk/src/app/Teams/index.tsx rename to src/frontend/apps/desk/src/features/teams/index.tsx