From 6611fbf9ac25f1bb3ac3fc449fb2b87cef45feb2 Mon Sep 17 00:00:00 2001 From: Vaibhav Devere <98757943+vaibhav-devere@users.noreply.github.com> Date: Tue, 8 Apr 2025 15:24:21 +0530 Subject: [PATCH] Fix : Menu shouldn't be displayed on logged out pages (#11437) #11414 Conditionally render MobileNavigationBar based on user authentication status - Added useIsLogged hook to check if the user is authenticated. - Updated MobileNavigationBar component to render only when the user is logged in. ![Screenshot from 2025-04-08 12-33-04](https://github.com/user-attachments/assets/1b58a5ac-e5ff-418f-a903-b952f37db84d) --------- Co-authored-by: Charles Bochet --- packages/twenty-front/folderStructure.json | 2 +- .../modules/navigation/components/MobileNavigationBar.tsx | 5 ++--- .../src/modules/ui/layout/page/components/DefaultLayout.tsx | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/twenty-front/folderStructure.json b/packages/twenty-front/folderStructure.json index 2509807f5..a740473fc 100644 --- a/packages/twenty-front/folderStructure.json +++ b/packages/twenty-front/folderStructure.json @@ -21,7 +21,7 @@ "moduleFolderRule": { "name": "{kebab-case}", - "folderRecursionLimit": 6, + "folderRecursionLimit": 4, "children": [ { "ruleId": "moduleFolderRule" }, { "name": "hooks", "ruleId": "hooksLeafFolderRule" }, diff --git a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx index e652bc61d..91024b725 100644 --- a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx +++ b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx @@ -4,8 +4,6 @@ import { isCommandMenuOpenedState } from '@/command-menu/states/isCommandMenuOpe import { useOpenSettingsMenu } from '@/navigation/hooks/useOpenSettings'; import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded'; import { useRecoilState } from 'recoil'; -import { useIsSettingsPage } from '../hooks/useIsSettingsPage'; -import { currentMobileNavigationDrawerState } from '../states/currentMobileNavigationDrawerState'; import { IconComponent, IconList, @@ -13,6 +11,8 @@ import { IconSettings, } from 'twenty-ui/display'; import { NavigationBar } from 'twenty-ui/navigation'; +import { useIsSettingsPage } from '../hooks/useIsSettingsPage'; +import { currentMobileNavigationDrawerState } from '../states/currentMobileNavigationDrawerState'; type NavigationBarItemName = 'main' | 'search' | 'tasks' | 'settings'; @@ -25,7 +25,6 @@ export const MobileNavigationBar = () => { useRecoilState(isNavigationDrawerExpandedState); const [currentMobileNavigationDrawer, setCurrentMobileNavigationDrawer] = useRecoilState(currentMobileNavigationDrawerState); - const { openSettingsMenu } = useOpenSettingsMenu(); const activeItemName = isNavigationDrawerExpanded diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx index 032891614..8030e18eb 100644 --- a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx +++ b/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx @@ -122,7 +122,7 @@ export const DefaultLayout = () => { )} - {isMobile && } + {isMobile && !showAuthModal && }