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

Refactor icons passed as props with the new way (#1492)

Browse Source 
* Refactor icons passed as props with the new way

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: Matheus <matheus_benini@hotmail.com>

* Update more files

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: Matheus <matheus_benini@hotmail.com>

* Fix according to review

* Fix according to review

* Fix according to review

* Fix chromatic regressions

---------

Co-authored-by: v1b3m <vibenjamin6@gmail.com>
Co-authored-by: Matheus <matheus_benini@hotmail.com>
Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
gitstart-twenty
2023-09-10 19:39:17 +01:00
committed by GitHub
parent 89fed80537
commit fb737e2021
82 changed files with 341 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
front/src/modules/activities/components/ActivityCreateButton.tsx
View File

@ -1,5 +1,3 @@
import { useTheme } from '@emotion/react';
import { Button } from '@/ui/button/components/Button';
import { ButtonGroup } from '@/ui/button/components/ButtonGroup';
import { IconCheckbox, IconNotes, IconTimelineEvent } from '@/ui/icon/index';
@ -15,21 +13,12 @@ export function ActivityCreateButton({
onTaskClick,
onActivityClick,
}: ActivityCreateButtonProps) {
const theme = useTheme();
return (
<ButtonGroup variant={'secondary'}>
<Button Icon={IconNotes} title="Note" onClick={onNoteClick} />
<Button Icon={IconCheckbox} title="Task" onClick={onTaskClick} />
<Button
icon={<IconNotes size={theme.icon.size.sm} />}
title="Note"
onClick={onNoteClick}
/>
<Button
icon={<IconCheckbox size={theme.icon.size.sm} />}
title="Task"
onClick={onTaskClick}
/>
<Button
icon={<IconTimelineEvent size={theme.icon.size.sm} />}
Icon={IconTimelineEvent}
title="Activity"
soon={true}
onClick={onActivityClick}

6
front/src/modules/activities/notes/components/Notes.tsx
View File

@ -1,4 +1,3 @@
import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
@ -48,7 +47,6 @@ const StyledNotesContainer = styled.div`
export function Notes({ entity }: { entity: ActivityTargetableEntity }) {
const { notes } = useNotes(entity);
const theme = useTheme();
const openCreateActivity = useOpenCreateActivityDrawer();
@ -58,7 +56,7 @@ export function Notes({ entity }: { entity: ActivityTargetableEntity }) {
<StyledEmptyTaskGroupTitle>No note yet</StyledEmptyTaskGroupTitle>
<StyledEmptyTaskGroupSubTitle>Create one:</StyledEmptyTaskGroupSubTitle>
<Button
icon={<IconNotes size={theme.icon.size.sm} />}
Icon={IconNotes}
title="New note"
variant="secondary"
onClick={() => openCreateActivity(ActivityType.Note, [entity])}
@ -74,7 +72,7 @@ export function Notes({ entity }: { entity: ActivityTargetableEntity }) {
notes={notes ?? []}
button={
<Button
icon={<IconNotes size={theme.icon.size.md} />}
Icon={IconNotes}
size="small"
variant="secondary"
title="Add note"

2
front/src/modules/activities/right-drawer/components/ActivityActionBar.tsx
View File

@ -33,7 +33,7 @@ export function ActivityActionBar({ activityId }: OwnProps) {
return (
<LightIconButton
icon={<IconTrash />}
Icon={IconTrash}
onClick={deleteActivity}
accent="tertiary"
size="medium"

5
front/src/modules/activities/tasks/components/AddTaskButton.tsx
View File

@ -1,5 +1,3 @@
import { useTheme } from '@emotion/react';
import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity';
import { Button } from '@/ui/button/components/Button';
@ -11,7 +9,6 @@ export function AddTaskButton({
}: {
entity?: ActivityTargetableEntity;
}) {
const theme = useTheme();
const openCreateActivity = useOpenCreateActivityDrawer();
if (!entity) {
@ -20,7 +17,7 @@ export function AddTaskButton({
return (
<Button
icon={<IconPlus size={theme.icon.size.md} />}
Icon={IconPlus}
size="small"
variant="secondary"
title="Add task"

4
front/src/modules/activities/tasks/components/TaskGroups.tsx
View File

@ -1,4 +1,3 @@
import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
@ -60,7 +59,6 @@ export function TaskGroups({ entity, showAddButton }: OwnProps) {
unscheduledTasks,
completedTasks,
} = useTasks(entity);
const theme = useTheme();
const openCreateActivity = useOpenCreateActivityDrawer();
@ -81,7 +79,7 @@ export function TaskGroups({ entity, showAddButton }: OwnProps) {
<StyledEmptyTaskGroupTitle>No task yet</StyledEmptyTaskGroupTitle>
<StyledEmptyTaskGroupSubTitle>Create one:</StyledEmptyTaskGroupSubTitle>
<Button
icon={<IconCheckbox size={theme.icon.size.sm} />}
Icon={IconCheckbox}
title="New task"
variant={'secondary'}
onClick={() =>