fix: rewrite member style

This commit is contained in:
DiamondThree
2023-01-23 10:26:51 +08:00
parent 7e23aa4618
commit ba7a4378ad
2 changed files with 18 additions and 12 deletions

View File

@@ -12,6 +12,7 @@ import {
StyledMoreVerticalButton, StyledMoreVerticalButton,
StyledPublishExplanation, StyledPublishExplanation,
StyledMemberWarp, StyledMemberWarp,
StyledMemberContainer,
} from './style'; } from './style';
import { MoreVerticalIcon, EmailIcon, TrashIcon } from '@blocksuite/icons'; import { MoreVerticalIcon, EmailIcon, TrashIcon } from '@blocksuite/icons';
import { useState } from 'react'; import { useState } from 'react';
@@ -31,14 +32,14 @@ import { useWorkspaceHelper } from '@/hooks/use-workspace-helper';
export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => { export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
const [isInviteModalShow, setIsInviteModalShow] = useState(false); const [isInviteModalShow, setIsInviteModalShow] = useState(false);
const { members, removeMember, loaded } = useMembers(); const { members, removeMember, loaded } = useMembers();
const { t } = useTranslation(); const { t } = useTranslation();
// FIXME: DELETE THIS
const { enableWorkspace } = useWorkspaceHelper(); const { enableWorkspace } = useWorkspaceHelper();
const { confirm } = useConfirm(); const { confirm } = useConfirm();
if (workspace.provider === 'affine') { if (workspace.provider === 'affine') {
return ( return (
<> <StyledMemberContainer>
<StyledMemberListContainer> <StyledMemberListContainer>
{!loaded && ( {!loaded && (
<Wrapper justifyContent="center"> <Wrapper justifyContent="center">
@@ -57,6 +58,7 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
<StyledMemberRoleContainer> <StyledMemberRoleContainer>
{t('Access level')} {t('Access level')}
</StyledMemberRoleContainer> </StyledMemberRoleContainer>
<div style={{ width: '24px', paddingRight: '48px' }}></div>
</StyledMemberTitleContainer> </StyledMemberTitleContainer>
{members.map((member, index) => { {members.map((member, index) => {
const user = Object.assign( const user = Object.assign(
@@ -153,7 +155,7 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
open={isInviteModalShow} open={isInviteModalShow}
></InviteMemberModal> ></InviteMemberModal>
</StyledMemberButtonContainer> </StyledMemberButtonContainer>
</> </StyledMemberContainer>
); );
} }

View File

@@ -1,14 +1,21 @@
import { styled } from '@/styles'; import { styled } from '@/styles';
import MuiAvatar from '@mui/material/Avatar'; import MuiAvatar from '@mui/material/Avatar';
export const StyledMemberTitleContainer = styled('div')(() => { export const StyledMemberTitleContainer = styled('li')(() => {
return { return {
display: 'flex', display: 'flex',
marginTop: '60px',
fontWeight: '500', fontWeight: '500',
marginBottom: '32px',
flex: 1, flex: 1,
}; };
}); });
export const StyledMemberContainer = styled('div')(() => {
return {
display: 'flex',
height: '100%',
flexDirection: 'column',
};
});
export const StyledMemberAvatar = styled(MuiAvatar)(() => { export const StyledMemberAvatar = styled(MuiAvatar)(() => {
return { height: '40px', width: '40px' }; return { height: '40px', width: '40px' };
@@ -18,8 +25,7 @@ export const StyledMemberNameContainer = styled('div')(() => {
return { return {
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
width: '402px', flex: '2 0 402px',
flex: 2,
}; };
}); });
@@ -27,17 +33,15 @@ export const StyledMemberRoleContainer = styled('div')(() => {
return { return {
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
width: '222px', flex: '1 0 222px',
flex: 1,
}; };
}); });
export const StyledMemberListContainer = styled('ul')(() => { export const StyledMemberListContainer = styled('ul')(() => {
return { return {
marginTop: '15px',
overflowY: 'scroll', overflowY: 'scroll',
width: '100%', width: '100%',
maxHeight: 'calc(100vh - 300px)', flex: 1,
}; };
}); });
@@ -60,7 +64,7 @@ export const StyledMemberName = styled('div')(({ theme }) => {
return { return {
fontWeight: '400', fontWeight: '400',
fontSize: '18px', fontSize: '18px',
lineHeight: '16px', lineHeight: '26px',
color: theme.colors.textColor, color: theme.colors.textColor,
}; };
}); });