Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-14 00:26:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feat/land page (#391)

Browse Source 
* feat: update landing page

* feat: update landing page

* fix: react warning

* feat(route): rename variables

* feat(route): better refresh

* fix: update logo and i18n

* feat(code): remove unused comment

* refactor(workspace): rename workspaceId

* refactor(page): rename pageId

* feat(edit): more robust editing experience

* fix: landing page mobile

* fix: landing page mobile

Co-authored-by: tzhangchi <terry.zhangchi@outlook.com>
Co-authored-by: DarkSky <25152247+darkskygit@users.noreply.github.com>
This commit is contained in:
zuomeng wang
2022-09-09 10:56:10 +08:00
committed by GitHub
parent bd2668335c
commit b35c9b2c14
35 changed files with 374 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ligo-virgo/src/pages/AppRoutes.tsx
+1 -1
View File
@@ -21,7 +21,7 @@ export function LigoVirgoRoutes() {
/>
<Route path="/ui" element={<UIPage />} />
<Route
path="/:workspace_id/*"
path="/:workspaceId/*"
element={
<RoutePrivate>
<WorkspaceContainer />
apps/ligo-virgo/src/pages/workspace/Edgeless.tsx
+2 -4
View File
@@ -14,7 +14,7 @@ type EdgelessProps = {
};
export const Edgeless = (props: EdgelessProps) => {
const { page_id } = useParams();
const { pageId } = useParams();
const { user } = useUserAndSpaces();
useEffect(() => {
@@ -31,7 +31,5 @@ export const Edgeless = (props: EdgelessProps) => {
update_recent_pages();
}, [user, props.workspace]);
return (
<MemoAffineBoard workspace={props.workspace} rootBlockId={page_id} />
);
return <MemoAffineBoard workspace={props.workspace} rootBlockId={pageId} />;
};
apps/ligo-virgo/src/pages/workspace/Home.tsx
+14 -12
View File
@@ -5,22 +5,23 @@ import { useNavigate, useParams } from 'react-router-dom';
export function WorkspaceHome() {
const navigate = useNavigate();
const { workspace_id } = useParams();
const { workspaceId } = useParams();
const { user } = useUserAndSpaces();
useEffect(() => {
const navigate_to_user_initial_page = async () => {
const [recent_pages, user_initial_page_id] = await Promise.all([
services.api.userConfig.getRecentPages(workspace_id, user.id),
const navigateToUserInitialPage = async () => {
const [recentPages, userInitialPageId] = await Promise.all([
services.api.userConfig.getRecentPages(workspaceId, user.id),
services.api.userConfig.getUserInitialPage(
workspace_id,
workspaceId,
user.id
),
]);
if (recent_pages.length === 0) {
// if recent pages if null, run initialize task
if (recentPages.length === 0) {
await services.api.editorBlock.copyTemplateToPage(
workspace_id,
user_initial_page_id,
workspaceId,
userInitialPageId,
TemplateFactory.generatePageTemplateByGroupKeys({
name: '👋 Get Started with AFFiNE',
groupKeys: [
@@ -31,11 +32,12 @@ export function WorkspaceHome() {
})
);
}
navigate(`/${workspace_id}/${user_initial_page_id}`);
if (userInitialPageId) {
navigate(`/${workspaceId}/${userInitialPageId}`);
}
};
navigate_to_user_initial_page();
}, [navigate, user.id, workspace_id]);
navigateToUserInitialPage();
}, [navigate, user.id, workspaceId]);
return null;
}
apps/ligo-virgo/src/pages/workspace/WorkspaceContainer.tsx
+5 -12
View File
@@ -7,27 +7,20 @@ import { WorkspaceHome } from './Home';
import Pages from './pages';
export function WorkspaceContainer() {
const { workspace_id } = useParams();
const { workspaceId } = useParams();
const { user, currentSpaceId } = useUserAndSpaces();
if (
user &&
![currentSpaceId, 'affine2vin277tcmafwq'].includes(workspace_id)
) {
// return <Navigate to={`/${currentSpaceId}`} replace={true} />;
}
return (
<Routes>
<Route path="/" element={<WorkspaceRootContainer />}>
<Route path="/pages" element={<Pages />} />
<Route
path="/:page_id/edgeless"
element={<Edgeless workspace={workspace_id} />}
path="/:pageId/edgeless"
element={<Edgeless workspace={workspaceId} />}
/>
<Route
path="/:page_id"
element={<Page workspace={workspace_id} />}
path="/:pageId"
element={<Page workspace={workspaceId} />}
/>
<Route path="/" element={<WorkspaceHome />} />
</Route>
apps/ligo-virgo/src/pages/workspace/docs/Page.tsx
+3 -3
View File
@@ -34,7 +34,7 @@ export function Page(props: PageProps) {
const [activeTab, setActiveTab] = useState(
TabMap.get(TAB_TITLE.PAGES).value
);
const { page_id } = useParams();
const { pageId } = useParams();
const { showSpaceSidebar, fixedDisplay, setSpaceSidebarVisible } =
useShowSpaceSidebar();
const dailyNotesFlag = useFlag('BooleanDailyNotes', false);
@@ -79,7 +79,7 @@ export function Page(props: PageProps) {
</div>
<div>
<CollapsiblePageTree title="PAGES">
{page_id ? <PageTree /> : null}
{pageId ? <PageTree /> : null}
</CollapsiblePageTree>
</div>
</div>
@@ -91,7 +91,7 @@ export function Page(props: PageProps) {
</WorkspaceSidebarContent>
</WorkspaceSidebar>
</LigoLeftContainer>
<EditorContainer workspace={props.workspace} pageId={page_id} />
<EditorContainer workspace={props.workspace} pageId={pageId} />
</LigoApp>
);
}
apps/ligo-virgo/src/pages/workspace/docs/collapsible-page-tree.tsx
+5 -5
View File
@@ -38,7 +38,7 @@ export type CollapsiblePageTreeProps = {
export function CollapsiblePageTree(props: CollapsiblePageTreeProps) {
const { className, style, children, title, initialOpen = true } = props;
const navigate = useNavigate();
const { workspace_id, page_id } = useParams();
const { workspaceId, pageId } = useParams();
const { handleAddPage } = usePageTree();
const { addPageToday } = useCalendarHeatmap();
@@ -46,18 +46,18 @@ export function CollapsiblePageTree(props: CollapsiblePageTreeProps) {
const [open, setOpen] = useState(initialOpen);
const create_page = useCallback(async () => {
if (page_id) {
if (pageId) {
const newPage = await services.api.editorBlock.create({
workspace: workspace_id,
workspace: workspaceId,
type: 'page' as const,
});
await handleAddPage(newPage.id);
addPageToday();
navigate(`/${workspace_id}/${newPage.id}`);
navigate(`/${workspaceId}/${newPage.id}`);
}
}, [addPageToday, handleAddPage, navigate, page_id, workspace_id]);
}, [addPageToday, handleAddPage, navigate, pageId, workspaceId]);
const [newPageBtnVisible, setNewPageBtnVisible] = useState<boolean>(false);
apps/ligo-virgo/src/pages/workspace/docs/components/toc/TOC.tsx
+5 -5
View File
@@ -116,7 +116,7 @@ const renderTOCContent = tocDataSource => {
};
export const TOC = () => {
const { page_id } = useParams();
const { pageId } = useParams();
const [tocDataSource, setTocDataSource] = useState<TOCType[]>([]);
const [activeBlockId, setActiveBlockId] = useState('');
@@ -124,7 +124,7 @@ export const TOC = () => {
const listenerMapRef = useRef<ListenerMap>(new Map());
const { currentEditors } = useCurrentEditors();
const editor = currentEditors[page_id] as Virgo;
const editor = currentEditors[pageId] as Virgo;
const updateTocDataSource = useCallback(async () => {
if (!editor) {
@@ -134,7 +134,7 @@ export const TOC = () => {
const listenerMap = listenerMapRef.current;
/* page listener: trigger update-notice when add new group */
const pageAsyncBlock = (await editor.getBlockByIds([page_id]))?.[0];
const pageAsyncBlock = (await editor.getBlockByIds([pageId]))?.[0];
if (!listenerMap.has(pageAsyncBlock.id)) {
listenerMap.set(
pageAsyncBlock.id,
@@ -144,7 +144,7 @@ export const TOC = () => {
/* block listener: trigger update-notice when change block content */
const { children = [] } =
(await editor.queryByPageId(page_id))?.[0] || {};
(await editor.queryByPageId(pageId))?.[0] || {};
const asyncBlocks = (await editor.getBlockByIds(children)) || [];
const { tocContents } = await getContentByAsyncBlocks(
asyncBlocks,
@@ -155,7 +155,7 @@ export const TOC = () => {
/* toc: flat content */
const tocDataSource = getPageTOC(asyncBlocks, tocContents);
setTocDataSource(tocDataSource);
}, [editor, page_id]);
}, [editor, pageId]);
/* init toc and add page/block update-listener & unmount-listener */
useEffect(() => {
apps/venus/src/app/common/Footer.tsx
+7 -6
View File
@@ -90,13 +90,14 @@ export const AFFiNEFooter = ({
sx={{
display: 'flex',
justifyContent: 'center',
maxWidth: '400px',
flexWrap: 'wrap',
maxWidth: '420px',
margin: 'auto',
marginBottom: '2em',
'--joy-shadow-sm': 0,
}}
>
<Box sx={{ display: 'flex', width: '100%' }}>
<Box sx={{ display: 'flex', width: '84px' }}>
<Button
variant="plain"
sx={{
@@ -144,7 +145,7 @@ export const AFFiNEFooter = ({
</Grid>
</Button>
</Box>
<Box sx={{ display: 'flex', width: '100%' }}>
<Box sx={{ display: 'flex', width: '84px' }}>
<Button
variant="plain"
sx={{
@@ -190,7 +191,7 @@ export const AFFiNEFooter = ({
</Grid>
</Button>
</Box>
<Box sx={{ display: 'flex', width: '100%' }}>
<Box sx={{ display: 'flex', width: '84px' }}>
<Button
variant="plain"
sx={{
@@ -239,7 +240,7 @@ export const AFFiNEFooter = ({
<Box
sx={{
display: 'flex',
width: '100%',
width: '84px',
}}
>
<Button
@@ -285,7 +286,7 @@ export const AFFiNEFooter = ({
</Grid>
</Button>
</Box>
<Box sx={{ display: 'flex', width: '100%' }}>
<Box sx={{ display: 'flex', width: '84px' }}>
<Button
variant="plain"
sx={{
apps/venus/src/app/common/Header.tsx
+33 -1
View File
@@ -11,6 +11,7 @@ import GitHubIcon from '@mui/icons-material/GitHub';
import { styled, useMediaQuery } from '@mui/material';
import AFFiNETextLogo from './affine-text-logo.png';
import { HoverMenu } from './HoverMenu';
import { MobileHeader } from './MobileHeader';
import { options } from '../i18n';
@@ -22,7 +23,10 @@ export const AFFiNEHeader = () => {
const changeLanguage = (event: any) => {
i18n.changeLanguage(event);
};
const matchesIPAD = useMediaQuery('(max-width: 768px)');
const matchesIPAD = useMediaQuery('(max-width: 1080px)');
if (matchesIPAD) {
return <MobileHeader />;
}
return (
<Container container spacing={2}>
<Grid xs={6} sx={{ display: 'flex', alignItems: 'center' }}>
@@ -135,6 +139,34 @@ export const AFFiNEHeader = () => {
window.open(href);
}}
/>
<HoverMenu
title={t('ContactUs')}
options={[
{
title: 'Discord',
value: 'https://discord.gg/Arn7TqJBvG',
},
{
title: 'Telegram',
value: 'https://t.me/affineworkos',
},
{
title: 'Reddit',
value: 'https://www.reddit.com/r/Affine/',
},
{
title: 'Medium',
value: 'https://medium.com/@affineworkos',
},
{
title: 'Email',
value: 'mailto:contact@toeverything.info',
},
]}
onSelect={href => {
window.open(href);
}}
/>
<Select
defaultValue="en"
sx={{ display: matchesIPAD ? 'none' : 'intial' }}
apps/venus/src/app/common/MobileHeader.tsx
+208
View File
@@ -0,0 +1,208 @@
import Close from '@mui/icons-material/Close';
import ExpandLess from '@mui/icons-material/ExpandLess';
import ExpandMore from '@mui/icons-material/ExpandMore';
import GitHubIcon from '@mui/icons-material/GitHub';
import Menu from '@mui/icons-material/Menu';
import { Button, Grid } from '@mui/joy';
import { useRef, useState } from 'react';
// eslint-disable-next-line no-restricted-imports
import {
Checkbox,
Collapse,
Drawer,
List,
ListItemButton,
ListItemText,
styled,
} from '@mui/material';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import AFFiNETextLogo from './affine-text-logo.png';
export const MobileHeader = () => {
const navigate = useNavigate();
const { i18n, t } = useTranslation();
const anchor = useRef<HTMLDivElement | null>(null);
const [openedDrawer, setDrawerState] = useState(false);
const handleDrawerOpenState = () => {
setDrawerState(!openedDrawer);
};
const [contactUsCollapse, setContactUsCollapse] = useState(false);
const handleContactUsClick = () => {
setContactUsCollapse(!contactUsCollapse);
};
const [languageCollapse, setLanguageCollapse] = useState(false);
const handleLanguageClick = () => {
setLanguageCollapse(!languageCollapse);
};
return (
<Container ref={anchor} container spacing={2}>
<Grid
xs={12}
sx={{
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
}}
>
<StyledImage
src={AFFiNETextLogo}
alt="affine"
onClick={() => navigate('/')}
/>
<div>
<Button
variant="plain"
onClick={() =>
window.open(
'https://github.com/toeverything/AFFiNE'
)
}
>
<GitHubIcon />
</Button>
<Button onClick={handleDrawerOpenState} variant="plain">
{openedDrawer ? <Close /> : <Menu />}
</Button>
</div>
</Grid>
<Drawer
anchor="top"
open={openedDrawer}
onClose={() => setDrawerState(false)}
>
<StyledDrawerContainer>
<List>
<ListItemButton onClick={() => navigate('/aboutus')}>
<ListItemText primary={t('AboutUs') as string} />
</ListItemButton>
<ListItemButton
onClick={() =>
window.open('https://blog.affine.pro')
}
>
<ListItemText primary={t('Blog') as string} />
</ListItemButton>
<ListItemButton
onClick={() =>
window.open('https://docs.affine.pro/')
}
>
<ListItemText primary={t('Docs') as string} />
</ListItemButton>
<ListItemButton
onClick={() =>
window.open('https://feedback.affine.pro/')
}
>
<ListItemText primary={t('Feedback') as string} />
</ListItemButton>
<ListItemButton onClick={handleContactUsClick}>
<ListItemText primary={t('ContactUs') as string} />
{contactUsCollapse ? (
<ExpandLess />
) : (
<ExpandMore />
)}
</ListItemButton>
<Collapse
in={contactUsCollapse}
timeout="auto"
unmountOnExit
>
<ListItemButton
onClick={() =>
window.open('https://discord.gg/Arn7TqJBvG')
}
>
<ListItemText primary="Discord" />
</ListItemButton>
<ListItemButton
onClick={() =>
window.open('https://t.me/affineworkos')
}
>
<ListItemText primary="Telegram" />
</ListItemButton>
<ListItemButton
onClick={() =>
window.open(
'https://www.reddit.com/r/Affine/'
)
}
>
<ListItemText primary="Reddit" />
</ListItemButton>
<ListItemButton
onClick={() =>
window.open(
'https://medium.com/@affineworkos'
)
}
>
<ListItemText primary="Medium" />
</ListItemButton>
<ListItemButton
onClick={() =>
window.open(
'mailto:contact@toeverything.info'
)
}
>
<ListItemText primary="Email" />
</ListItemButton>
</Collapse>
<ListItemButton onClick={handleLanguageClick}>
<ListItemText primary={t('language') as string} />
{languageCollapse ? <ExpandLess /> : <ExpandMore />}
</ListItemButton>
<Collapse
in={languageCollapse}
timeout="auto"
unmountOnExit
>
<ListItemButton
onClick={() => i18n.changeLanguage('en')}
>
<ListItemText primary="English" />
<Checkbox checked={i18n.language === 'en'} />
</ListItemButton>
<ListItemButton
onClick={() => i18n.changeLanguage('zh')}
>
<ListItemText primary="简体中文" />
<Checkbox checked={i18n.language === 'zh'} />
</ListItemButton>
</Collapse>
</List>
</StyledDrawerContainer>
</Drawer>
</Container>
);
};
const Container = styled(Grid)({
position: 'fixed',
top: 0,
left: '50%',
transform: 'translateX(-50%)',
width: '100%',
paddingTop: '1em',
backgroundColor: '#fff',
zIndex: 1500,
maxWidth: '1440px',
margin: 'auto',
marginTop: '0 !important',
});
const StyledImage = styled('img')({
height: '24px',
marginRight: '16px',
cursor: 'pointer',
});
const StyledDrawerContainer = styled('div')({
paddingTop: '72px',
});
apps/venus/src/app/i18n/resources/en.json
+1
View File
@@ -10,6 +10,7 @@
"Alternative": "Alternative",
"Check GitHub": "Check GitHub",
"Try it Online": "Try it Online",
"language": "Language",
"description1": {
"part1": "Affine is the next-generation collaborative knowledge base for professionals.",
"part2": "It's not just a collection of Docs, whiteboard, and tables.",
apps/venus/src/app/i18n/resources/zh.json
+1
View File
@@ -10,6 +10,7 @@
"Alternative": "的另一种选择",
"Check GitHub": "GitHub中查看",
"Try it Online": "在线试用",
"language": "语言",
"description1": {
"part1": "Affine是面向专业人士的下一代协同知识库",
"part2": "它不仅仅是一个文档、白板和表格的集合。",
libs/components/common/src/lib/text/plugins/reflink.tsx
+3 -3
View File
@@ -2,8 +2,8 @@ import { useNavigate, useParams } from 'react-router-dom';
import { Descendant } from 'slate';
// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
import { BlockSearchItem } from '@toeverything/datasource/jwt';
import { styled } from '@toeverything/components/ui';
import { BlockSearchItem } from '@toeverything/datasource/jwt';
import { BlockPreview } from '../../block-preview';
@@ -26,14 +26,14 @@ type InlineRefLinkProps = {
};
export const InlineRefLink = ({ block, pageId }: InlineRefLinkProps) => {
const { workspace_id } = useParams();
const { workspaceId } = useParams();
const navigate = useNavigate();
if (block) {
return (
<BlockPreviewContainer
block={block}
onClick={() => navigate(`/${workspace_id}/${pageId}`)}
onClick={() => navigate(`/${workspaceId}/${pageId}`)}
/>
);
}
libs/components/editor-blocks/src/blocks/code/CodeView.tsx
-3
View File
@@ -164,9 +164,6 @@ export const CodeView = ({ block, editor }: CreateCodeView) => {
};
useEffect(() => {
handleLangChange(langType ? langType : DEFAULT_LANG);
// setTimeout(() => {
// focusCode();
// }, 100);
}, []);
const copyCode = () => {
libs/components/editor-blocks/src/blocks/page/PageView.tsx
+2 -2
View File
@@ -16,7 +16,7 @@ import {
} from '../../components/text-manage';
export const PageView = ({ block, editor }: CreateView) => {
const { workspace_id } = useParams();
const { workspaceId } = useParams();
const textRef = useRef<ExtendedTextUtils>(null);
const [backLinks, setBackLinks] =
useState<Awaited<ReturnType<typeof editor.search>>>();
@@ -100,7 +100,7 @@ export const PageView = ({ block, editor }: CreateView) => {
className={style9(styles.content)}
suppressContentEditableWarning
> */}
<BackLink blocks={backLinks} workspaceId={workspace_id} />
<BackLink blocks={backLinks} workspaceId={workspaceId} />
{/*{block.childrenIds.map(childId => (*/}
{/* <RenderBlock key={childId} blockId={childId} />*/}
{/*))}*/}
libs/components/editor-blocks/src/blocks/ref-link/ref-link-view.tsx
+4 -4
View File
@@ -6,16 +6,16 @@ import { CreateView } from '@toeverything/framework/virgo';
type RefLinkView = CreateView;
export const RefLinkView = ({ block, editor }: RefLinkView) => {
const page_id = useMemo(() => block.getProperty('reference'), [block]);
const pageId = useMemo(() => block.getProperty('reference'), [block]);
const [block_content, set_block] =
useState<Awaited<ReturnType<typeof editor.search>>[number]>();
useEffect(() => {
editor
.search({ tag: `id:${page_id}` })
.search({ tag: `id:${pageId}` })
.then(block => set_block(block[0]));
}, [editor, page_id]);
}, [editor, pageId]);
return <InlineRefLink block={block_content} pageId={page_id} />;
return <InlineRefLink block={block_content} pageId={pageId} />;
};
libs/components/editor-blocks/src/blocks/text/TextView.tsx
+3 -1
View File
@@ -90,7 +90,9 @@ export const TextView = ({
await block.removeChildren();
await block.after(nextBlock);
editor.selectionManager.activeNodeByNodeId(nextBlock.id);
setTimeout(() => {
editor.selectionManager.activeNodeByNodeId(nextBlock.id, 'start');
});
return true;
};
libs/components/editor-plugins/src/comment/use-add-comment.ts
+3 -3
View File
@@ -1,6 +1,6 @@
import { useState, useCallback } from 'react';
import { useParams } from 'react-router-dom';
import { services } from '@toeverything/datasource/db-service';
import { useCallback, useState } from 'react';
import { useParams } from 'react-router-dom';
import { WithEditorSelectionType } from '../menu/inline-menu/types';
export const useAddComment = ({
@@ -8,7 +8,7 @@ export const useAddComment = ({
selectionInfo,
setShow,
}: WithEditorSelectionType) => {
const { workspace_id: workspaceId, page_id: pageId } = useParams();
const { workspaceId, pageId } = useParams();
const [currentComment, setCurrentComment] = useState('');
const createComment = useCallback(async (): Promise<{
libs/components/editor-plugins/src/menu/double-link-menu/DoubleLinkMenu.tsx
+1 -1
View File
@@ -44,7 +44,7 @@ export const DoubleLinkMenu = ({
hooks,
style,
}: DoubleLinkMenuProps) => {
const { page_id: curPageId } = useParams();
const { pageId: curPageId } = useParams();
const [isOpen, setIsOpen] = useState(false);
const [anchorEl, setAnchorEl] = useState(null);
const dialogRef = useRef<HTMLDivElement>();
libs/components/editor-plugins/src/menu/link-menu/LinkMenu.tsx
+1 -1
View File
@@ -42,7 +42,7 @@ const normalizeUrl = (url: string) => {
};
export const LinkMenu = ({ editor, hooks }: LinkMenuProps) => {
const { page_id: curPageId } = useParams();
const { pageId: curPageId } = useParams();
const [isOpen, setIsOpen] = useState(false);
const [anchorEl, setAnchorEl] = useState(null);
const dialogRef = useRef<HTMLDivElement>();
libs/components/editor-plugins/src/search/Search.tsx
+1 -1
View File
@@ -47,7 +47,7 @@ type SearchProps = {
};
export const Search = (props: SearchProps) => {
const { workspace_id: workspaceId } = useParams();
const { workspaceId } = useParams();
const navigate = useNavigate();
const [open, setOpen] = useState(false);
libs/components/layout/src/header/EditorBoardSwitcher/Switcher.tsx
+1 -1
View File
@@ -16,7 +16,7 @@ export const Switcher = () => {
if (targetViewMode === pageViewMode) {
return;
}
const workspaceId = params['workspace_id'];
const workspaceId = params['workspaceId'];
/**
* There are two possible modes:
* Page mode: /{workspaceId}/{pageId}
libs/components/layout/src/header/Header.tsx
+3 -3
View File
@@ -46,7 +46,7 @@ export const AffineHeader = () => {
useUserAndSpaces();
const showCenterTab =
(params['workspace_id'] || pathname.includes('/space/')) && params['*'];
(params['workspaceId'] || pathname.includes('/space/')) && params['*'];
if (hideAffineHeader(pathname)) {
return null;
@@ -82,7 +82,7 @@ export const AffineHeader = () => {
isEdgelessView
? navigate(
`/${
params['workspace_id'] ||
params['workspaceId'] ||
'space'
}/${params['*'].slice(0, -11)}`
)
@@ -108,7 +108,7 @@ export const AffineHeader = () => {
? null
: navigate(
`/${
params['workspace_id'] ||
params['workspaceId'] ||
'space'
}/${params['*']}` + '/edgeless'
)
libs/components/layout/src/header/PageSettingPortal.tsx
+10 -10
View File
@@ -50,7 +50,7 @@ const MESSAGES = {
function PageSettingPortal() {
const [alertOpen, setAlertOpen] = useState(false);
const { workspace_id } = useParams();
const { workspaceId } = useParams();
const [pageBlock, setPageBlock] = useState<PageBlock>();
const params = useParams();
@@ -64,7 +64,7 @@ function PageSettingPortal() {
const fetchPageBlock = useCallback(async () => {
const dbPageBlock = await services.api.editorBlock.getBlock(
workspace_id,
workspaceId,
pageId
);
if (!dbPageBlock) return;
@@ -78,11 +78,11 @@ function PageSettingPortal() {
//@ts-ignore
text.value[0].text,
});
}, [workspace_id, pageId]);
}, [workspaceId, pageId]);
useEffect(() => {
fetchPageBlock();
}, [workspace_id, pageId, fetchPageBlock]);
}, [workspaceId, pageId, fetchPageBlock]);
const redirectToPage = (newWorkspaceId: string, newPageId: string) => {
navigate('/' + newWorkspaceId + '/' + newPageId);
};
@@ -90,23 +90,23 @@ function PageSettingPortal() {
const handleDuplicatePage = async () => {
//create page
const newPage = await services.api.editorBlock.create({
workspace: workspace_id,
workspace: workspaceId,
type: 'page' as const,
});
//add page to tree
await services.api.pageTree.addNextPageToWorkspace(
workspace_id,
workspaceId,
pageId,
newPage.id
);
//copy source page to new page
await services.api.editorBlock.copyPage(
workspace_id,
workspaceId,
pageId,
newPage.id
);
redirectToPage(workspace_id, newPage.id);
redirectToPage(workspaceId, newPage.id);
};
const handleCopy = () => {
@@ -128,7 +128,7 @@ function PageSettingPortal() {
.inspector()
.load()
.then(() => {
window.location.href = `/${workspace_id}/`;
window.location.href = `/${workspaceId}/`;
});
};
@@ -145,7 +145,7 @@ function PageSettingPortal() {
fullWidthChecked: checked,
},
id: pageId,
workspace: workspace_id,
workspace: workspaceId,
});
};
libs/components/layout/src/header/Title.tsx
+7 -7
View File
@@ -12,7 +12,7 @@ import { useUserAndSpaces } from '@toeverything/datasource/state';
export const CurrentPageTitle = () => {
const { user } = useUserAndSpaces();
const params = useParams();
const { workspace_id } = params;
const { workspaceId } = params;
const [pageId, setPageId] = useState<string>('');
const [pageTitle, setPageTitle] = useState<string | undefined>();
/* card.7 */
@@ -25,9 +25,9 @@ export const CurrentPageTitle = () => {
}, [params]);
const fetchPageTitle = useCallback(async () => {
if (!workspace_id || !pageId) return;
if (!workspaceId || !pageId) return;
const [pageEditorBlock] = await services.api.editorBlock.get({
workspace: workspace_id,
workspace: workspaceId,
ids: [pageId],
});
/* card.7 */
@@ -39,21 +39,21 @@ export const CurrentPageTitle = () => {
?.map(v => v.text)
.join('') ?? 'Untitled'
);
}, [pageId, workspace_id]);
}, [pageId, workspaceId]);
useEffect(() => {
if (user) fetchPageTitle();
}, [fetchPageTitle, user]);
useEffect(() => {
if (!user || !workspace_id || !pageId || pageTitle === undefined)
if (!user || !workspaceId || !pageId || pageTitle === undefined)
return () => {};
let unobserve: () => void;
const auto_update_title = async () => {
// console.log(';; title registration auto update');
unobserve = await services.api.editorBlock.observe(
{ workspace: workspace_id, id: pageId },
{ workspace: workspaceId, id: pageId },
businessBlock => {
// console.log(';; auto_update_title', businessBlock);
fetchPageTitle();
@@ -65,7 +65,7 @@ export const CurrentPageTitle = () => {
return () => {
// unobserve?.();
};
}, [fetchPageTitle, pageId, pageTitle, user, workspace_id]);
}, [fetchPageTitle, pageId, pageTitle, user, workspaceId]);
useEffect(() => {
document.title = pageTitle || '';
libs/components/layout/src/settings-sidebar/Comments/use-comments.ts
+2 -2
View File
@@ -9,7 +9,7 @@ import { useParams } from 'react-router-dom';
import type { CommentInfo } from './type';
export const useComments = () => {
const { workspace_id: workspaceId, page_id: pageId } = useParams();
const { workspaceId, pageId } = useParams();
const [comments, setComments] = useState<CommentInfo[]>([]);
const [observeIds, setObserveIds] = useState<string[]>([]);
@@ -71,7 +71,7 @@ export const useComments = () => {
};
export const useActiveComment = () => {
const { workspace_id: workspaceId, page_id: pageId } = useParams();
const { workspaceId, pageId } = useParams();
const { currentEditors } = useCurrentEditors();
const editor = useMemo(() => {
return currentEditors[pageId] as Virgo;
libs/components/layout/src/settings-sidebar/Settings/util/use-workspace-page.ts
+1 -1
View File
@@ -7,7 +7,7 @@ interface UseWorkspaceAndPageIdReturn {
export const useWorkspaceAndPageId = (): UseWorkspaceAndPageIdReturn => {
const params = useParams();
const workspaceId = params['workspace_id'];
const workspaceId = params['workspaceId'];
const pageId = params['*'].split('/')[0];
return {
workspaceId,
libs/components/layout/src/workspace-sidebar/calendar-heatmap/utils.ts
+2 -2
View File
@@ -47,8 +47,8 @@ export async function fetchActivitiesHeatmap(
// const pages = await db.getByType('page');
const pages_with_ids = (await Promise.all(
flattenedItems.map(async (page_item: any) => {
const page_id = page_item.id;
return [page_id, await db.get(page_id as 'page')];
const pageId = page_item.id;
return [pageId, await db.get(pageId as 'page')];
})
)) as [string, BlockImplInstance][];
const pages = new Map(pages_with_ids);
libs/components/layout/src/workspace-sidebar/page-tree/tree-item/TreeItem.tsx
+6 -4
View File
@@ -57,7 +57,9 @@ export const TreeItem = forwardRef<HTMLDivElement, TreeItemProps>(
},
ref
) => {
const { workspace_id, page_id } = useParams();
const params = useParams();
const workspaceId = params['workspaceId'];
const curPageId = params['pageId'];
const BooleanPageTreeItemMoreActions = useFlag(
'BooleanPageTreeItemMoreActions',
true
@@ -71,7 +73,7 @@ export const TreeItem = forwardRef<HTMLDivElement, TreeItemProps>(
disableSelection={disableSelection}
disableInteraction={disableInteraction}
spacing={`${indentationWidth * depth + 12}px`}
active={pageId === page_id}
active={pageId === curPageId}
{...props}
>
{childCount !== 0 ? (
@@ -89,12 +91,12 @@ export const TreeItem = forwardRef<HTMLDivElement, TreeItemProps>(
)}
<TreeItemContent {...handleProps}>
<TextLink to={`/${workspace_id}/${pageId}`}>
<TextLink to={`/${workspaceId}/${pageId}`}>
{value}
</TextLink>
{BooleanPageTreeItemMoreActions && (
<MoreActions
workspaceId={workspace_id}
workspaceId={workspaceId}
pageId={pageId}
onRemove={onRemove}
/>
libs/components/layout/src/workspace-sidebar/page-tree/use-page-tree.ts
+16 -16
View File
@@ -19,7 +19,7 @@ import {
const page_tree_atom = atom<TreeItems | undefined>([]);
export const usePageTree = ({ indentationWidth = 16 }: DndTreeProps = {}) => {
const { workspace_id, page_id } = useParams();
const { workspaceId, pageId } = useParams();
const navigate = useNavigate();
const [items] = useAtom(page_tree_atom);
const [activeId, setActiveId] = useState<string | undefined>(undefined);
@@ -56,11 +56,11 @@ export const usePageTree = ({ indentationWidth = 16 }: DndTreeProps = {}) => {
const savePageTreeData = useCallback(
async (treeData?: TreeItem[]) => {
await services.api.pageTree.setPageTree<TreeItem>(
workspace_id,
workspaceId,
treeData || []
);
},
[workspace_id]
[workspaceId]
);
const resetState = useCallback(() => {
@@ -129,19 +129,19 @@ export const usePageTree = ({ indentationWidth = 16 }: DndTreeProps = {}) => {
const handleRemove = useCallback(
async (id: string) => {
await savePageTreeData(removeItem(items, id));
await services.api.userConfig.removePage(workspace_id, id);
await services.api.userConfig.removePage(workspaceId, id);
//remove page from jwst
await services.api.pageTree.removePage(workspace_id, id);
if (id === page_id) {
navigate(`/${workspace_id}`);
await services.api.pageTree.removePage(workspaceId, id);
if (id === pageId) {
navigate(`/${workspaceId}`);
}
},
[items, savePageTreeData, workspace_id]
[items, savePageTreeData, workspaceId]
);
const handleAddPage = useCallback(
async (page_id?: string) => {
await savePageTreeData([{ id: page_id, children: [] }, ...items]);
async (pageId?: string) => {
await savePageTreeData([{ id: pageId, children: [] }, ...items]);
},
[items, savePageTreeData]
);
@@ -177,25 +177,25 @@ export const usePageTree = ({ indentationWidth = 16 }: DndTreeProps = {}) => {
export const useDndTreeAutoUpdate = () => {
const [, set_items] = useAtom(page_tree_atom);
const { workspace_id, page_id } = useParams();
const { workspaceId, pageId } = useParams();
const fetch_page_tree_data = useCallback(async () => {
const pages = await services.api.pageTree.getPageTree<TreeItem>(
workspace_id
workspaceId
);
set_items(pages);
}, [set_items, workspace_id]);
}, [set_items, workspaceId]);
useEffect(() => {
fetch_page_tree_data();
}, [fetch_page_tree_data]);
useEffect(() => {
if (!page_id) return () => {};
if (!pageId) return () => {};
let unobserve: () => void;
const auto_update_page_tree = async () => {
unobserve = await services.api.pageTree.observe(
{ workspace: workspace_id, page: page_id },
{ workspace: workspaceId, page: pageId },
() => {
fetch_page_tree_data();
}
@@ -206,5 +206,5 @@ export const useDndTreeAutoUpdate = () => {
return () => {
unobserve?.();
};
}, [fetch_page_tree_data, page_id, workspace_id]);
}, [fetch_page_tree_data, pageId, workspaceId]);
};
libs/datasource/db-service/src/services/editor-block/index.ts
+17 -20
View File
@@ -265,37 +265,34 @@ export class EditorBlock extends ServiceBaseClass {
}
}
async copyPage(
workspace_id: string,
source_page_id: string,
new_page_id: string
workspaceId: string,
sourcePageId: string,
newPageId: string
): Promise<boolean> {
const db = await this.database.getDatabase(workspace_id);
const db = await this.database.getDatabase(workspaceId);
const source_page = await this.getBlock(
workspace_id,
source_page_id as 'block'
const sourcePage = await this.getBlock(
workspaceId,
sourcePageId as 'block'
);
const new_page = await this.getBlock(
workspace_id,
new_page_id as 'block'
);
if (!source_page) {
const newPage = await this.getBlock(workspaceId, newPageId as 'block');
if (!sourcePage) {
return false;
}
const source_page_children = source_page.children;
const decorations = source_page.getDecorations();
const sourcePageChildren = sourcePage.children;
const decorations = sourcePage.getDecorations();
Object.entries(decorations).forEach(([key, value]) => {
new_page?.setDecoration(key, source_page.getDecoration(key));
newPage?.setDecoration(key, sourcePage.getDecoration(key));
});
//@ts-ignore
this.decorate_page_title(new_page, 'copy from ');
this.decorate_page_title(newPage, 'copy from ');
for (let i = 0; i < source_page_children.length; i++) {
const source_page_child = await db.get(
source_page_children[i] as 'block'
for (let i = 0; i < sourcePageChildren.length; i++) {
const sourcePageChild = await db.get(
sourcePageChildren[i] as 'block'
);
new_page?.insertChildren(source_page_child);
newPage?.insertChildren(sourcePageChild);
}
return true;
}
libs/datasource/jwt/src/yjs/index.ts
+3 -3
View File
@@ -350,7 +350,7 @@ export class YjsAdapter implements AsyncDatabaseAdapter<YjsContentOperation> {
const [file] = (await fromEvent(handles)) as File[];
const binary = await file?.arrayBuffer();
console.log(this._provider.providers);
let { indexeddb } = (
const { indexeddb } = (
this._provider.providers as any[]
).find(p => p.indexeddb);
await indexeddb?.idb?.clearData();
@@ -391,9 +391,9 @@ export class YjsAdapter implements AsyncDatabaseAdapter<YjsContentOperation> {
},
parse: () => this._doc.toJSON(),
// eslint-disable-next-line @typescript-eslint/naming-convention
parse_page: (page_id: string) => {
parse_page: (pageId: string) => {
const blocks = this._blocks.toJSON();
return resolve_block(blocks, page_id);
return resolve_block(blocks, pageId);
},
// eslint-disable-next-line @typescript-eslint/naming-convention
parse_pages: (resolve = false) => {
libs/datasource/state/src/page.ts
+1 -1
View File
@@ -9,7 +9,7 @@ const _currentEditors = atom<EditorsMap>({} as EditorsMap);
/** hook for using editors outside page */
export const useCurrentEditors = () => {
const { workspace_id: workspaceId, page_id: pageId } = useParams();
const { workspaceId, pageId } = useParams();
const { pathname } = useLocation();
const [currentEditors, setCurrentEditors] = useAtom(_currentEditors);
libs/datasource/state/src/user.ts
-5
View File
@@ -5,7 +5,6 @@ import {
} from 'firebase/auth';
import { atom, useAtom } from 'jotai';
import { useEffect, useMemo } from 'react';
import { useLocation, useNavigate } from 'react-router';
import { useIdentifyUser } from '@toeverything/datasource/feature-flags';
import { UserInfo } from '@toeverything/utils';
@@ -63,15 +62,11 @@ const BRAND_ID = 'AFFiNE';
const _localTrigger = atom<boolean>(false);
const _useUserAndSpacesForFreeLogin = () => {
const location = useLocation();
const navigate = useNavigate();
const [user, setUser] = useAtom(_userAtom);
const [loading, setLoading] = useAtom(_loadingAtom);
const [localTrigger] = useAtom(_localTrigger);
useEffect(() => {
if (loading) {
navigate(`/${BRAND_ID}`);
setLoading(false);
}
}, []);
libs/utils/src/utils.ts
+2 -2
View File
@@ -6,8 +6,8 @@ export function getUserDisplayName(user?: UserInfo) {
}
/**
* Get page_id from URL
* @returns page_id
* Get pageId from URL
* @returns pageId
*/
export function getPageId() {
const path = window.location.pathname.match(/\/(\w+)\/(\w+)/);