admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix workspace logo (#9129)

Browse Source 
Follow up on:
https://github.com/twentyhq/twenty/issues/9042#issuecomment-2550886611
This commit is contained in:
Charles Bochet
2024-12-18 18:09:52 +01:00
committed by GitHub
parent 5586270df4
commit 71254bfca0
4 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
View File

@ -19,7 +19,7 @@ export type NavigationDrawerProps = {
className?: string;
footer?: ReactNode;
logo?: string;
title?: string;
title: string;
};
const StyledAnimatedContainer = styled(motion.div)<{ isSettings?: boolean }>`
@ -111,15 +111,15 @@ export const NavigationDrawer = ({
onMouseEnter={handleHover}
onMouseLeave={handleMouseLeave}
>
{isSettingsDrawer && title ? (
!isMobile && <NavigationDrawerBackButton title={title} />
) : (
<NavigationDrawerHeader
name={title}
logo={logo}
showCollapseButton={isHovered}
/>
)}
{isSettingsDrawer && title
? !isMobile && <NavigationDrawerBackButton title={title} />
: logo && (
<NavigationDrawerHeader
name={title}
logo={logo}
showCollapseButton={isHovered}
/>
)}
<StyledItemsContainer isSettings={isSettingsDrawer}>
{children}
</StyledItemsContainer>

10
packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx
View File

@ -3,8 +3,6 @@ import { useRecoilValue } from 'recoil';
import { workspacesState } from '@/auth/states/workspaces';
import { MultiWorkspaceDropdownButton } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdownButton';
import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';
import { DEFAULT_WORKSPACE_NAME } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceName';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
@ -41,14 +39,14 @@ const StyledNavigationDrawerCollapseButton = styled(
`;
type NavigationDrawerHeaderProps = {
name?: string;
logo?: string;
name: string;
logo: string;
showCollapseButton: boolean;
};
export const NavigationDrawerHeader = ({
name = DEFAULT_WORKSPACE_NAME,
logo = DEFAULT_WORKSPACE_LOGO,
name,
logo,
showCollapseButton,
}: NavigationDrawerHeaderProps) => {
const isMobile = useIsMobile();