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

2
front/src/pages/settings/SettingsExperience.tsx
View File

@ -20,7 +20,7 @@ export function SettingsExperience() {
const { colorScheme, setColorScheme } = useColorScheme();
return (
<SubMenuTopBarContainer icon={<IconSettings size={16} />} title="Settings">
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
<StyledContainer>
<H1Title title="Experience" />
<Section>

2
front/src/pages/settings/SettingsProfile.tsx
View File

@ -23,7 +23,7 @@ const StyledContainer = styled.div`
export function SettingsProfile() {
return (
<SubMenuTopBarContainer icon={<IconSettings size={16} />} title="Settings">
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
<>
<StyledContainer>
<H1Title title="Profile" />

2
front/src/pages/settings/SettingsWorkspace.tsx
View File

@ -18,7 +18,7 @@ const StyledContainer = styled.div`
export function SettingsWorkspace() {
return (
<SubMenuTopBarContainer icon={<IconSettings size={16} />} title="Settings">
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
<div>
<StyledContainer>
<H1Title title="General" />

14
front/src/pages/settings/SettingsWorkspaceMembers.tsx
View File

@ -1,10 +1,9 @@
import { useState } from 'react';
import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { useRecoilState } from 'recoil';
import { currentUserState } from '@/auth/states/currentUserState';
import { Button } from '@/ui/button/components/Button';
import { IconButton } from '@/ui/button/components/IconButton';
import { IconSettings, IconTrash } from '@/ui/icon';
import { SubMenuTopBarContainer } from '@/ui/layout/components/SubMenuTopBarContainer';
import { ConfirmationModal } from '@/ui/modal/components/ConfirmationModal';
@ -39,7 +38,6 @@ export function SettingsWorkspaceMembers() {
const [currentUser] = useRecoilState(currentUserState);
const workspace = currentUser?.workspaceMember?.workspace;
const theme = useTheme();
const { data } = useGetWorkspaceMembersQuery();
@ -85,7 +83,7 @@ export function SettingsWorkspaceMembers() {
};
return (
<SubMenuTopBarContainer icon={<IconSettings size={16} />} title="Settings">
<SubMenuTopBarContainer Icon={IconSettings} title="Settings">
<StyledContainer>
<H1Title title="Members" />
{workspace?.inviteHash && (
@ -111,14 +109,14 @@ export function SettingsWorkspaceMembers() {
accessory={
currentUser?.id !== member.user.id && (
<StyledButtonContainer>
<Button
<IconButton
onClick={() => {
setIsConfirmationModalOpen(true);
setUserToDelete(member.user.id);
}}
variant={'tertiary'}
size={'small'}
icon={<IconTrash size={theme.icon.size.md} />}
variant="tertiary"
size="medium"
Icon={IconTrash}
/>
</StyledButtonContainer>
)