From 51e6f4344ae21bd73176a55e6a55ff1efcc1d4dd Mon Sep 17 00:00:00 2001 From: DiamondThree <857159145@qq.com> Date: Tue, 10 Jan 2023 15:06:55 +0800 Subject: [PATCH] fix: setting style and replace refer --- .../src/components/workspace-avatar/index.tsx | 1 + .../workspace-setting/general/General.tsx | 22 ++++++------------- .../src/components/workspace-setting/index.ts | 1 + .../src/components/workspace-setting/style.ts | 4 ---- .../WorkspaceSelector/WorkspaceSelector.tsx | 3 +-- .../app/src/hooks/use-workspace-helper.ts | 12 +++++----- .../pages/workspace/[workspaceId]/setting.tsx | 15 +++++++------ 7 files changed, 23 insertions(+), 35 deletions(-) diff --git a/packages/app/src/components/workspace-avatar/index.tsx b/packages/app/src/components/workspace-avatar/index.tsx index b810a0e72..bcb5b1aa2 100644 --- a/packages/app/src/components/workspace-avatar/index.tsx +++ b/packages/app/src/components/workspace-avatar/index.tsx @@ -3,6 +3,7 @@ import { stringToColour } from '@/utils'; interface IWorkspaceAvatar { size: number; name: string; + avatar: string; } export const WorkspaceAvatar = (props: IWorkspaceAvatar) => { diff --git a/packages/app/src/components/workspace-setting/general/General.tsx b/packages/app/src/components/workspace-setting/general/General.tsx index a424685e9..f33f3e3eb 100644 --- a/packages/app/src/components/workspace-setting/general/General.tsx +++ b/packages/app/src/components/workspace-setting/general/General.tsx @@ -43,24 +43,12 @@ export const GeneralPage = ({ workspace }: { workspace: WorkspaceInfo }) => { const handleUpdateWorkspaceName = () => { console.log('currentWorkspace: ', currentWorkspace); updateWorkspace({ name: workspaceName }, currentWorkspace); - // workspace && currentWorkspace(workspace.id, { name: workspaceName }); }; const fileChange = async (file: File) => { - console.log('file: ', file); + // console.log('file: ', file); setUploading(true); - // const blob = new Blob([file], { type: file.type }); - // const blobId = await getDataCenter() - // .then(dc => dc.apis.uploadBlob({ blob })) - // .finally(() => { - // setUploading(false); - // }); - // if (blobId) { - // currentWorkspace?.meta.setAvatar(blobId); - // // workspaces[workspace.id]?.meta.setAvatar(blobId); - // setUploading(false); - // debouncedRefreshWorkspacesMeta(); - // } + const blob = new Blob([file], { type: file.type }); }; return workspace ? ( @@ -73,7 +61,11 @@ export const GeneralPage = ({ workspace }: { workspace: WorkspaceInfo }) => { marginRight: '20px', }} > - + { export const StyledSettingContent = styled('div')(() => { return { paddingLeft: '48px', - height: '620px', }; }); @@ -30,7 +29,6 @@ export const StyledSetting = styled('div')(({ theme }) => { { return { width: '236px', - height: '620px', background: theme.mode === 'dark' ? '#272727' : '#FBFBFC', }; } @@ -136,7 +134,6 @@ export const StyledMemberRoleContainer = styled('div')(() => { export const StyledMemberListContainer = styled('ul')(() => { return { marginTop: '15px', - height: '432px', overflowY: 'scroll', }; }); @@ -220,7 +217,6 @@ export const StyledCopyButtonContainer = styled('div')(() => { export const StyledPublishContent = styled('div')(() => { return { - height: '494px', display: 'flex', flexDirection: 'column', }; diff --git a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx index 1f2b9612f..2a19bd7d9 100644 --- a/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx +++ b/packages/app/src/components/workspace-slider-bar/WorkspaceSelector/WorkspaceSelector.tsx @@ -6,14 +6,12 @@ import { useAppState } from '@/providers/app-state-provider'; export const WorkspaceSelector = () => { const [workspaceListShow, setWorkspaceListShow] = useState(false); const { currentMetaWorkSpace, workspaceList } = useAppState(); - console.log('currentMetaWorkSpace: ', currentMetaWorkSpace); useEffect(() => { if (workspaceList.length === 0) { setWorkspaceListShow(true); } }, [workspaceList]); - return ( <> { diff --git a/packages/app/src/hooks/use-workspace-helper.ts b/packages/app/src/hooks/use-workspace-helper.ts index 798c7c383..f22f8cd4a 100644 --- a/packages/app/src/hooks/use-workspace-helper.ts +++ b/packages/app/src/hooks/use-workspace-helper.ts @@ -1,13 +1,10 @@ import { useAppState } from '@/providers/app-state-provider'; -import { stringToColour } from '@/utils'; -import { WorkspaceInfo } from '@affine/datacenter'; import { Workspace } from '@blocksuite/store'; export const useWorkspaceHelper = () => { const { dataCenter } = useAppState(); const createWorkspace = async (name: string) => { const workspaceInfo = await dataCenter.createWorkspace({ name: name, - avatar: 'cccc', }); if (workspaceInfo && workspaceInfo.room) { const workspace = await dataCenter.loadWorkspace(workspaceInfo.room); @@ -23,15 +20,16 @@ export const useWorkspaceHelper = () => { }; const updateWorkspace = async ( - { name, avatar }: { name?: string; avatar?: string }, + { name, avatarBlob }: { name?: string; avatarBlob?: Blob }, workspace: Workspace ) => { if (name) { dataCenter.updateWorkspaceMeta({ name }, workspace); } - // if (avatar) { - // dataCenter.resetWorkspaceMeta({ avatar }, workspace); - // } + if (avatarBlob) { + const blobId = await dataCenter.setBlob(workspace, avatarBlob); + dataCenter.updateWorkspaceMeta({ avatar: blobId }, workspace); + } }; return { createWorkspace, diff --git a/packages/app/src/pages/workspace/[workspaceId]/setting.tsx b/packages/app/src/pages/workspace/[workspaceId]/setting.tsx index 27122bb2f..8a2eb2129 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/setting.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/setting.tsx @@ -1,4 +1,3 @@ -import Modal, { ModalCloseButton } from '@/ui/modal'; import { StyledSettingContainer, StyledSettingContent, @@ -7,7 +6,7 @@ import { StyledSettingTabContainer, StyledSettingTagIconContainer, WorkspaceSettingTagItem, -} from '../../../components/workspace-setting/style'; +} from '@/components/workspace-setting/style'; import { EditIcon, UsersIcon, @@ -15,11 +14,13 @@ import { CloudInsyncIcon, } from '@blocksuite/icons'; import { ReactElement, useEffect, useState } from 'react'; -import { GeneralPage } from '../../../components/workspace-setting/general'; -import { MembersPage } from '../../../components/workspace-setting/MembersPage'; -import { PublishPage } from '../../../components/workspace-setting/PublishPage'; -import { ExportPage } from '../../../components/workspace-setting/ExportPage'; -import { SyncPage } from '../../../components/workspace-setting/SyncPage'; +import { + GeneralPage, + MembersPage, + PublishPage, + ExportPage, + SyncPage, +} from '@/components/workspace-setting'; import { useAppState } from '@/providers/app-state-provider'; import WorkspaceLayout from '@/components/workspace-layout';