From 33bb48e68161a3f7d1b12f8f4c066060b1674d18 Mon Sep 17 00:00:00 2001 From: Lucas Bordeau Date: Mon, 5 Feb 2024 11:27:51 +0100 Subject: [PATCH] Refactored dependencies from App component (#3763) * Refactored PageTitle to remove a dependency to location from App component * Refactored DefaultHomePage and DefaultPageTitle to remove dependencies from App component. --- packages/twenty-front/src/App.tsx | 15 +++++---------- packages/twenty-front/src/DefaultPageTitle.tsx | 11 +++++++++++ .../twenty-front/src/pages/DefaultHomePage.tsx | 9 +++++++++ 3 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 packages/twenty-front/src/DefaultPageTitle.tsx create mode 100644 packages/twenty-front/src/pages/DefaultHomePage.tsx diff --git a/packages/twenty-front/src/App.tsx b/packages/twenty-front/src/App.tsx index 33e6f2676..36a847dda 100644 --- a/packages/twenty-front/src/App.tsx +++ b/packages/twenty-front/src/App.tsx @@ -1,19 +1,19 @@ -import { Navigate, Route, Routes, useLocation } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; import { AppPath } from '@/types/AppPath'; import { SettingsPath } from '@/types/SettingsPath'; import { DefaultLayout } from '@/ui/layout/page/DefaultLayout'; -import { PageTitle } from '@/ui/utilities/page-title/PageTitle'; import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled'; +import { DefaultPageTitle } from '~/DefaultPageTitle'; import { CommandMenuEffect } from '~/effect-components/CommandMenuEffect'; import { GotoHotkeysEffect } from '~/effect-components/GotoHotkeysEffect'; -import { useDefaultHomePagePath } from '~/hooks/useDefaultHomePagePath'; import { CreateProfile } from '~/pages/auth/CreateProfile'; import { CreateWorkspace } from '~/pages/auth/CreateWorkspace'; import { PasswordReset } from '~/pages/auth/PasswordReset'; import { PlanRequired } from '~/pages/auth/PlanRequired'; import { SignInUp } from '~/pages/auth/SignInUp'; import { VerifyEffect } from '~/pages/auth/VerifyEffect'; +import { DefaultHomePage } from '~/pages/DefaultHomePage'; import { ImpersonateEffect } from '~/pages/impersonate/ImpersonateEffect'; import { NotFound } from '~/pages/not-found/NotFound'; import { RecordIndexPage } from '~/pages/object-record/RecordIndexPage'; @@ -38,20 +38,15 @@ import { SettingsProfile } from '~/pages/settings/SettingsProfile'; import { SettingsWorkspace } from '~/pages/settings/SettingsWorkspace'; import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMembers'; import { Tasks } from '~/pages/tasks/Tasks'; -import { getPageTitleFromPath } from '~/utils/title-utils'; export const App = () => { - const { pathname } = useLocation(); - const { defaultHomePagePath } = useDefaultHomePagePath(); - - const pageTitle = getPageTitleFromPath(pathname); const isNewRecordBoardEnabled = useIsFeatureEnabled( 'IS_NEW_RECORD_BOARD_ENABLED', ); return ( <> - + @@ -64,7 +59,7 @@ export const App = () => { } /> } /> } /> - } /> + } /> } /> } /> diff --git a/packages/twenty-front/src/DefaultPageTitle.tsx b/packages/twenty-front/src/DefaultPageTitle.tsx new file mode 100644 index 000000000..87b3c17f0 --- /dev/null +++ b/packages/twenty-front/src/DefaultPageTitle.tsx @@ -0,0 +1,11 @@ +import { useLocation } from 'react-router-dom'; + +import { PageTitle } from '@/ui/utilities/page-title/PageTitle'; +import { getPageTitleFromPath } from '~/utils/title-utils'; + +export const DefaultPageTitle = () => { + const { pathname } = useLocation(); + const pageTitle = getPageTitleFromPath(pathname); + + return ; +}; diff --git a/packages/twenty-front/src/pages/DefaultHomePage.tsx b/packages/twenty-front/src/pages/DefaultHomePage.tsx new file mode 100644 index 000000000..5fe09abdc --- /dev/null +++ b/packages/twenty-front/src/pages/DefaultHomePage.tsx @@ -0,0 +1,9 @@ +import { Navigate } from 'react-router-dom'; + +import { useDefaultHomePagePath } from '~/hooks/useDefaultHomePagePath'; + +export const DefaultHomePage = () => { + const { defaultHomePagePath } = useDefaultHomePagePath(); + + return ; +};