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

Integrate favorites into release (#1168)

Browse Source
This commit is contained in:
Charles Bochet
2023-08-11 00:42:58 +02:00
committed by GitHub
parent 0490c6b6ea
commit 285bf773de
8 changed files with 79 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/modules/ui/layout/components/WithTopBarContainer.tsx
View File

@ -13,7 +13,7 @@ type OwnProps = {
isFavorite?: boolean;
icon: ReactNode;
onAddButtonClick?: () => void;
onFavouriteButtonClick?: () => void;
onFavoriteButtonClick?: () => void;
};
const StyledContainer = styled.div`
@ -29,7 +29,7 @@ export function WithTopBarContainer({
isFavorite,
icon,
onAddButtonClick,
onFavouriteButtonClick,
onFavoriteButtonClick,
}: OwnProps) {
return (
<StyledContainer>
@ -40,7 +40,7 @@ export function WithTopBarContainer({
isFavorite={isFavorite}
icon={icon}
onAddButtonClick={onAddButtonClick}
onFavouriteButtonClick={onFavouriteButtonClick}
onFavoriteButtonClick={onFavoriteButtonClick}
/>
<RightDrawerContainer topMargin={PAGE_BAR_MIN_HEIGHT + 16 + 16}>
{children}

10
front/src/modules/ui/layout/page-bar/components/PageBar.tsx
View File

@ -69,7 +69,7 @@ type OwnProps = {
isFavorite?: boolean;
icon: ReactNode;
onAddButtonClick?: () => void;
onFavouriteButtonClick?: () => void;
onFavoriteButtonClick?: () => void;
};
export function PageBar({
@ -78,7 +78,7 @@ export function PageBar({
isFavorite,
icon,
onAddButtonClick,
onFavouriteButtonClick,
onFavoriteButtonClick,
}: OwnProps) {
const navigate = useNavigate();
const navigateBack = useCallback(() => navigate(-1), [navigate]);
@ -114,13 +114,13 @@ export function PageBar({
</StyledTopBarIconTitleContainer>
</StyledLeftContainer>
<ActionButtonsContainer>
{onFavouriteButtonClick && (
{onFavoriteButtonClick && (
<IconButton
icon={<IconHeart size={16} />}
size="large"
data-testid="add-button"
accent={isFavorite ? 'red' : 'regular'}
onClick={onFavouriteButtonClick}
textColor={isFavorite ? 'danger' : 'secondary'}
onClick={onFavoriteButtonClick}
variant="border"
/>
)}