@@ -128,7 +132,7 @@ export const ContactModal = ({ open, onClose }: TransitionsModalProps) => {
target="_blank"
rel="noreferrer"
>
- How is AFFiNE Alpha different？
+ {t('How is AFFiNE Alpha different?')}
Copyright © 2022 Toeverything
diff --git a/packages/app/src/components/editor-mode-switch/index.tsx b/packages/app/src/components/editor-mode-switch/index.tsx
index 8a219e4757..86a54d8606 100644
--- a/packages/app/src/components/editor-mode-switch/index.tsx
+++ b/packages/app/src/components/editor-mode-switch/index.tsx
@@ -15,7 +15,7 @@ import { useTheme } from '@/providers/themeProvider';
import { EdgelessIcon, PaperIcon } from './icons';
import useCurrentPageMeta from '@/hooks/use-current-page-meta';
import { usePageHelper } from '@/hooks/use-page-helper';
-
+import { useTranslation } from 'react-i18next';
const PaperItem = ({ active }: { active?: boolean }) => {
const {
theme: {
@@ -96,7 +96,7 @@ export const EditorModeSwitch = ({
setRadioItemStatus(modifyRadioItemStatus());
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isHover, mode]);
-
+ const { t } = useTranslation();
return (
}
active={mode === 'page'}
status={radioItemStatus.left}
@@ -126,7 +126,7 @@ export const EditorModeSwitch = ({
}
active={mode === 'edgeless'}
diff --git a/packages/app/src/components/header/editor-header.tsx b/packages/app/src/components/header/editor-header.tsx
index c1b52ec464..7f433de467 100644
--- a/packages/app/src/components/header/editor-header.tsx
+++ b/packages/app/src/components/header/editor-header.tsx
@@ -22,14 +22,14 @@ export const EditorHeader = () => {
useEffect(() => {
onPropsUpdated(editor => {
- setTitle(editor.model?.title || 'Untitled');
+ setTitle(editor.pageBlockModel?.title || 'Untitled');
});
}, [onPropsUpdated]);
useEffect(() => {
setTimeout(() => {
// If first time in, need to wait for editor to be inserted into DOM
- setTitle(editor?.model?.title || 'Untitled');
+ setTitle(editor?.pageBlockModel?.title || 'Untitled');
}, 300);
}, [editor]);
diff --git a/packages/app/src/components/header/header-right-items/editor-option-menu.tsx b/packages/app/src/components/header/header-right-items/editor-option-menu.tsx
index ea71aef757..cfd2813de5 100644
--- a/packages/app/src/components/header/header-right-items/editor-option-menu.tsx
+++ b/packages/app/src/components/header/header-right-items/editor-option-menu.tsx
@@ -16,12 +16,13 @@ import { usePageHelper } from '@/hooks/use-page-helper';
import { useConfirm } from '@/providers/confirm-provider';
import useCurrentPageMeta from '@/hooks/use-current-page-meta';
import { toast } from '@/ui/toast';
-
+import { useTranslation } from 'react-i18next';
const PopoverContent = () => {
const { editor } = useAppState();
const { toggleFavoritePage, toggleDeletePage } = usePageHelper();
const { changePageMode } = usePageHelper();
const { confirm } = useConfirm();
+ const { t } = useTranslation();
const {
mode = 'page',
id = '',
@@ -35,11 +36,13 @@ const PopoverContent = () => {
data-testid="editor-option-menu-favorite"
onClick={() => {
toggleFavoritePage(id);
- toast(!favorite ? 'Removed to Favourites' : 'Added to Favourites');
+ toast(
+ favorite ? t('Removed from Favourites') : t('Added to Favourites')
+ );
}}
icon={favorite ? : }
>
- {favorite ? 'Remove' : 'Add'} to favourites
+ {favorite ? t('Remove from favourites') : t('Add to favourites')}
: }
@@ -48,7 +51,8 @@ const PopoverContent = () => {
changePageMode(id, mode === 'page' ? 'edgeless' : 'page');
}}
>
- Convert to {mode === 'page' ? 'Edgeless' : 'Page'}
+ {t('Convert to ')}
+ {mode === 'page' ? t('Edgeless') : t('Page')}
);
diff --git a/packages/app/src/components/header/quick-search-button.tsx b/packages/app/src/components/header/quick-search-button.tsx
index a08c61bf65..e45e78fed4 100644
--- a/packages/app/src/components/header/quick-search-button.tsx
+++ b/packages/app/src/components/header/quick-search-button.tsx
@@ -3,15 +3,15 @@ import { IconButton, IconButtonProps } from '@/ui/button';
import { Tooltip } from '@/ui/tooltip';
import { ArrowDownIcon } from '@blocksuite/icons';
import { useModal } from '@/providers/global-modal-provider';
-
+import { useTranslation } from 'react-i18next';
export const QuickSearchButton = ({
onClick,
...props
}: Omit) => {
const { triggerQuickSearchModal } = useModal();
-
+ const { t } = useTranslation();
return (
-
+
{showList.includes('contact') && (
-
+
)}
{showList.includes('shortcuts') && (
-
+
{
const [status, setStatus] = useState<'unImported' | 'importing'>('importing');
const { openPage, createPage } = usePageHelper();
const { currentWorkspace } = useAppState();
+ const { t } = useTranslation();
const _applyTemplate = function (pageId: string, template: Template) {
const page = currentWorkspace?.getPage(pageId);
@@ -29,9 +31,10 @@ export const ImportModal = ({ open, onClose }: ImportModalProps) => {
setTimeout(() => {
const editor = document.querySelector('editor-container');
if (editor) {
- const groupId = page.addBlock({ flavour: 'affine:group' }, pageId);
+ page.addBlock({ flavour: 'affine:surface' }, null);
+ const frameId = page.addBlock({ flavour: 'affine:frame' }, pageId);
// TODO blocksuite should offer a method to import markdown from store
- editor.clipboard.importMarkdown(template.source, `${groupId}`);
+ editor.clipboard.importMarkdown(template.source, `${frameId}`);
page.resetHistory();
editor.requestUpdate();
}
@@ -84,7 +87,7 @@ export const ImportModal = ({ open, onClose }: ImportModalProps) => {
- Import
+ {t('Import')}
{status === 'unImported' && (
diff --git a/packages/app/src/components/page-list/index.tsx b/packages/app/src/components/page-list/index.tsx
index f63fa39944..604d71000f 100644
--- a/packages/app/src/components/page-list/index.tsx
+++ b/packages/app/src/components/page-list/index.tsx
@@ -24,7 +24,7 @@ import { useAppState } from '@/providers/app-state-provider/context';
import { toast } from '@/ui/toast';
import { usePageHelper } from '@/hooks/use-page-helper';
import { useTheme } from '@/providers/themeProvider';
-
+import { useTranslation } from 'react-i18next';
const FavoriteTag = ({
pageMeta: { favorite, id },
}: {
@@ -32,9 +32,10 @@ const FavoriteTag = ({
}) => {
const { toggleFavoritePage } = usePageHelper();
const { theme } = useTheme();
+ const { t } = useTranslation();
return (
{
e.stopPropagation();
toggleFavoritePage(id);
- toast(!favorite ? 'Removed to Favourites' : 'Added to Favourites');
+ toast(
+ favorite ? t('Removed from Favourites') : t('Added to Favourites')
+ );
}}
style={{
color: favorite ? theme.colors.primaryColor : theme.colors.iconColor,
@@ -71,6 +74,7 @@ export const PageList = ({
}) => {
const router = useRouter();
const { currentWorkspaceId } = useAppState();
+ const { t } = useTranslation();
if (pageList.length === 0) {
return ;
}
@@ -80,10 +84,10 @@ export const PageList = ({
- Title
- Created
+ {t('Title')}
+ {t('Created')}
- {isTrash ? 'Moved to Trash' : 'Updated'}
+ {isTrash ? t('Moved to Trash') : t('Updated')}
@@ -108,7 +112,7 @@ export const PageList = ({
)}
- {pageMeta.title || 'Untitled'}
+ {pageMeta.title || t('Untitled')}
{showFavoriteTag && }
diff --git a/packages/app/src/components/page-list/operation-cell.tsx b/packages/app/src/components/page-list/operation-cell.tsx
index 7416b65d9a..1b4ec7434a 100644
--- a/packages/app/src/components/page-list/operation-cell.tsx
+++ b/packages/app/src/components/page-list/operation-cell.tsx
@@ -14,23 +14,25 @@ import {
} from '@blocksuite/icons';
import { toast } from '@/ui/toast';
import { usePageHelper } from '@/hooks/use-page-helper';
-
+import { useTranslation } from 'react-i18next';
export const OperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => {
const { id, favorite } = pageMeta;
const { openPage } = usePageHelper();
const { toggleFavoritePage, toggleDeletePage } = usePageHelper();
const { confirm } = useConfirm();
-
+ const { t } = useTranslation();
const OperationMenu = (
<>
);
@@ -74,7 +78,7 @@ export const TrashOperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => {
const { openPage, getPageMeta } = usePageHelper();
const { toggleDeletePage, permanentlyDeletePage } = usePageHelper();
const { confirm } = useConfirm();
-
+ const { t } = useTranslation();
return (
{
style={{ marginRight: '12px' }}
onClick={() => {
toggleDeletePage(id);
- toast(`${getPageMeta(id)?.title || 'Untitled'} restored`);
+ toast(t('restored', { title: getPageMeta(id)?.title || 'Untitled' }));
openPage(id);
}}
>
@@ -92,13 +96,13 @@ export const TrashOperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => {
darker={true}
onClick={() => {
confirm({
- title: 'Delete permanently?',
- content: "Once deleted, you can't undo this action.",
- confirmText: 'Delete',
+ title: t('Delete permanently?'),
+ content: t("Once deleted, you can't undo this action."),
+ confirmText: t('Delete'),
confirmType: 'danger',
}).then(confirm => {
confirm && permanentlyDeletePage(id);
- toast('Permanently deleted');
+ toast(t('Permanently deleted'));
});
}}
>
diff --git a/packages/app/src/components/quick-search/config.ts b/packages/app/src/components/quick-search/config.ts
index 7c5b8afe72..c35636c3cc 100644
--- a/packages/app/src/components/quick-search/config.ts
+++ b/packages/app/src/components/quick-search/config.ts
@@ -1,21 +1,29 @@
import { AllPagesIcon, FavouritesIcon, TrashIcon } from '@blocksuite/icons';
+import { useTranslation } from 'react-i18next';
-export const config = (currentWorkspaceId: string) => {
+export const useSwitchToConfig = (
+ currentWorkspaceId: string
+): {
+ title: string;
+ href: string;
+ icon: React.FC>;
+}[] => {
+ const { t } = useTranslation();
const List = [
{
- title: 'All pages',
+ title: t('All pages'),
href: currentWorkspaceId ? `/workspace/${currentWorkspaceId}/all` : '',
icon: AllPagesIcon,
},
{
- title: 'Favourites',
+ title: t('Favourites'),
href: currentWorkspaceId
? `/workspace/${currentWorkspaceId}/favorite`
: '',
icon: FavouritesIcon,
},
{
- title: 'Trash',
+ title: t('Trash'),
href: currentWorkspaceId ? `/workspace/${currentWorkspaceId}/trash` : '',
icon: TrashIcon,
},
diff --git a/packages/app/src/components/quick-search/footer.tsx b/packages/app/src/components/quick-search/footer.tsx
index 5f03b6c85e..48914cda73 100644
--- a/packages/app/src/components/quick-search/footer.tsx
+++ b/packages/app/src/components/quick-search/footer.tsx
@@ -4,10 +4,11 @@ import { StyledModalFooterContent } from './style';
import { useModal } from '@/providers/global-modal-provider';
import { Command } from 'cmdk';
import { usePageHelper } from '@/hooks/use-page-helper';
-
+import { useTranslation } from 'react-i18next';
export const Footer = (props: { query: string }) => {
const { triggerQuickSearchModal } = useModal();
const { openPage, createPage } = usePageHelper();
+ const { t } = useTranslation();
const query = props.query;
return (
@@ -25,9 +26,9 @@ export const Footer = (props: { query: string }) => {
{query ? (
- New "{query}" page
+ {t('New Keyword Page', { query: query })}
) : (
- New page
+ {t('New Page')}
)}
diff --git a/packages/app/src/components/quick-search/results.tsx b/packages/app/src/components/quick-search/results.tsx
index 2a99e389ff..eeb9fc2d44 100644
--- a/packages/app/src/components/quick-search/results.tsx
+++ b/packages/app/src/components/quick-search/results.tsx
@@ -5,8 +5,9 @@ import { PaperIcon, EdgelessIcon } from '@blocksuite/icons';
import { Dispatch, SetStateAction, useEffect, useState } from 'react';
import { useAppState } from '@/providers/app-state-provider';
import { useRouter } from 'next/router';
-import { config } from './config';
+import { useSwitchToConfig } from './config';
import { NoResultSVG } from './noResultSVG';
+import { useTranslation } from 'react-i18next';
import usePageHelper from '@/hooks/use-page-helper';
import usePageMetaList from '@/hooks/use-page-meta-list';
export const Results = (props: {
@@ -25,8 +26,9 @@ export const Results = (props: {
const router = useRouter();
const { currentWorkspaceId } = useAppState();
const { search } = usePageHelper();
- const List = config(currentWorkspaceId);
+ const List = useSwitchToConfig(currentWorkspaceId);
const [results, setResults] = useState(new Map());
+ const { t } = useTranslation();
useEffect(() => {
setResults(search(query));
setLoading(false);
@@ -47,7 +49,9 @@ export const Results = (props: {
<>
{query ? (
resultsPageMeta.length ? (
-
+
{resultsPageMeta.map(result => {
return (
) : (
- Find 0 result
+ {t('Find 0 result')}
)
) : (
-
+
{List.map(link => {
return (
{
+ const { t } = useTranslation();
+ return {
+ [t('Undo')]: '⌘+Z',
+ [t('Redo')]: '⌘+⇧+Z',
+ [t('Bold')]: '⌘+B',
+ [t('Italic')]: '⌘+I',
+ [t('Underline')]: '⌘+U',
+ [t('Strikethrough')]: '⌘+⇧+S',
+ [t('Inline code')]: ' ⌘+E',
+ [t('Code block')]: '⌘+⌥+C',
+ [t('Link')]: '⌘+K',
+ [t('Body text')]: '⌘+⌥+0',
+ [t('Heading', { number: '1' })]: '⌘+⌥+1',
+ [t('Heading', { number: '2' })]: '⌘+⌥+2',
+ [t('Heading', { number: '3' })]: '⌘+⌥+3',
+ [t('Heading', { number: '4' })]: '⌘+⌥+4',
+ [t('Heading', { number: '5' })]: '⌘+⌥+5',
+ [t('Heading', { number: '6' })]: '⌘+⌥+6',
+ [t('Increase indent')]: 'Tab',
+ [t('Reduce indent')]: '⇧+Tab',
+ };
};
-export const macMarkdownShortcuts = {
- Bold: '**Text** ',
- Italic: '*Text* ',
- Underline: '~Text~ ',
- Strikethrough: '~~Text~~ ',
- Divider: '***',
- 'Inline code': '`Text` ',
- 'Code block': '``` Space',
- 'Heading 1': '# Text',
- 'Heading 2': '## Text',
- 'Heading 3': '### Text',
- 'Heading 4': '#### Text',
- 'Heading 5': '##### Text',
- 'Heading 6': '###### Text',
+export const useMacMarkdownShortcuts = (): ShortcutTip => {
+ const { t } = useTranslation();
+ return {
+ [t('Bold')]: '**Text** ',
+ [t('Italic')]: '*Text* ',
+ [t('Underline')]: '~Text~ ',
+ [t('Strikethrough')]: '~~Text~~ ',
+ [t('Divider')]: '***',
+ [t('Inline code')]: '`Text` ',
+ [t('Code block')]: '``` Space',
+ [t('Heading', { number: '1' })]: '# Text',
+ [t('Heading', { number: '2' })]: '## Text',
+ [t('Heading', { number: '3' })]: '### Text',
+ [t('Heading', { number: '4' })]: '#### Text',
+ [t('Heading', { number: '5' })]: '##### Text',
+ [t('Heading', { number: '6' })]: '###### Text',
+ };
};
-export const windowsKeyboardShortcuts = {
- Undo: 'Ctrl+Z',
- Redo: 'Ctrl+Y',
- Bold: 'Ctrl+B',
- Italic: 'Ctrl+I',
- Underline: 'Ctrl+U',
- Strikethrough: 'Ctrl+Shift+S',
- 'Inline code': ' Ctrl+E',
- 'Code block': 'Ctrl+Alt+C',
- Link: 'Ctrl+K',
- 'Body text': 'Ctrl+Shift+0',
- 'Heading 1': 'Ctrl+Shift+1',
- 'Heading 2': 'Ctrl+Shift+2',
- 'Heading 3': 'Ctrl+Shift+3',
- 'Heading 4': 'Ctrl+Shift+4',
- 'Heading 5': 'Ctrl+Shift+5',
- 'Heading 6': 'Ctrl+Shift+6',
- 'Increase indent': 'Tab',
- 'Reduce indent': 'Shift+Tab',
+export const useWindowsKeyboardShortcuts = (): ShortcutTip => {
+ const { t } = useTranslation();
+ return {
+ [t('Undo')]: 'Ctrl+Z',
+ [t('Redo')]: 'Ctrl+Y',
+ [t('Bold')]: 'Ctrl+B',
+ [t('Italic')]: 'Ctrl+I',
+ [t('Underline')]: 'Ctrl+U',
+ [t('Strikethrough')]: 'Ctrl+Shift+S',
+ [t('Inline code')]: ' Ctrl+E',
+ [t('Code block')]: 'Ctrl+Alt+C',
+ [t('Link')]: 'Ctrl+K',
+ [t('Body text')]: 'Ctrl+Shift+0',
+ [t('Heading', { number: '1' })]: 'Ctrl+Shift+1',
+ [t('Heading', { number: '2' })]: 'Ctrl+Shift+2',
+ [t('Heading', { number: '3' })]: 'Ctrl+Shift+3',
+ [t('Heading', { number: '4' })]: 'Ctrl+Shift+4',
+ [t('Heading', { number: '5' })]: 'Ctrl+Shift+5',
+ [t('Heading', { number: '6' })]: 'Ctrl+Shift+6',
+ [t('Increase indent')]: 'Tab',
+ [t('Reduce indent')]: 'Shift+Tab',
+ };
};
-export const winMarkdownShortcuts = {
- Bold: '**Text** ',
- Italic: '*Text* ',
- Underline: '~Text~ ',
- Strikethrough: '~~Text~~ ',
- 'Inline code': '`Text` ',
- 'Code block': '``` Text',
- 'Heading 1': '# Text',
- 'Heading 2': '## Text',
- 'Heading 3': '### Text',
- 'Heading 4': '#### Text',
- 'Heading 5': '##### Text',
- 'Heading 6': '###### Text',
+export const useWinMarkdownShortcuts = (): ShortcutTip => {
+ const { t } = useTranslation();
+ return {
+ [t('Bold')]: '**Text** ',
+ [t('Italic')]: '*Text* ',
+ [t('Underline')]: '~Text~ ',
+ [t('Strikethrough')]: '~~Text~~ ',
+ [t('Divider')]: '***',
+ [t('Inline code')]: '`Text` ',
+ [t('Code block')]: '``` Text',
+ [t('Heading', { number: '1' })]: '# Text',
+ [t('Heading', { number: '2' })]: '## Text',
+ [t('Heading', { number: '3' })]: '### Text',
+ [t('Heading', { number: '4' })]: '#### Text',
+ [t('Heading', { number: '5' })]: '##### Text',
+ [t('Heading', { number: '6' })]: '###### Text',
+ };
};
diff --git a/packages/app/src/components/shortcuts-modal/index.tsx b/packages/app/src/components/shortcuts-modal/index.tsx
index 63a4246d64..4f28b0ecec 100644
--- a/packages/app/src/components/shortcuts-modal/index.tsx
+++ b/packages/app/src/components/shortcuts-modal/index.tsx
@@ -8,14 +8,15 @@ import {
StyledTitle,
} from './style';
import {
- macKeyboardShortcuts,
- macMarkdownShortcuts,
- windowsKeyboardShortcuts,
- winMarkdownShortcuts,
+ useMacKeyboardShortcuts,
+ useMacMarkdownShortcuts,
+ useWindowsKeyboardShortcuts,
+ useWinMarkdownShortcuts,
} from '@/components/shortcuts-modal/config';
import Slide from '@mui/material/Slide';
import { ModalCloseButton } from '@/ui/modal';
import { getUaHelper } from '@/utils';
+import { useTranslation } from 'react-i18next';
type ModalProps = {
open: boolean;
onClose: () => void;
@@ -26,12 +27,18 @@ const isMac = () => {
};
export const ShortcutsModal = ({ open, onClose }: ModalProps) => {
+ const { t } = useTranslation();
+ const macMarkdownShortcuts = useMacMarkdownShortcuts();
+ const winMarkdownShortcuts = useWinMarkdownShortcuts();
+ const macKeyboardShortcuts = useMacKeyboardShortcuts();
+ const windowsKeyboardShortcuts = useWindowsKeyboardShortcuts();
const markdownShortcuts = isMac()
? macMarkdownShortcuts
: winMarkdownShortcuts;
const keyboardShortcuts = isMac()
? macKeyboardShortcuts
: windowsKeyboardShortcuts;
+
return createPortal(
@@ -39,7 +46,7 @@ export const ShortcutsModal = ({ open, onClose }: ModalProps) => {
- Shortcuts
+ {t('Shortcuts')}
{
/>
- Keyboard Shortcuts
+ {t('Keyboard Shortcuts')}
{Object.entries(keyboardShortcuts).map(([title, shortcuts]) => {
return (
@@ -63,7 +70,7 @@ export const ShortcutsModal = ({ open, onClose }: ModalProps) => {
);
})}
- Markdown Syntax
+ {t('Markdown Syntax')}
{Object.entries(markdownShortcuts).map(([title, shortcuts]) => {
return (
diff --git a/packages/app/src/components/workspace-slider-bar/index.tsx b/packages/app/src/components/workspace-slider-bar/index.tsx
index 559e0b983a..61e81cb3ed 100644
--- a/packages/app/src/components/workspace-slider-bar/index.tsx
+++ b/packages/app/src/components/workspace-slider-bar/index.tsx
@@ -4,14 +4,14 @@ import {
StyledArrowButton,
StyledLink,
StyledListItem,
- StyledListItemForWorkspace,
+ // StyledListItemForWorkspace,
StyledNewPageButton,
StyledSliderBar,
StyledSliderBarWrapper,
StyledSubListItem,
} from './style';
import { Arrow } from './icons';
-import { WorkspaceSelector } from './WorkspaceSelector';
+// import { WorkspaceSelector } from './WorkspaceSelector';
import Collapse from '@mui/material/Collapse';
import {
ArrowDownIcon,
@@ -26,17 +26,17 @@ import Link from 'next/link';
import { Tooltip } from '@/ui/tooltip';
import { useModal } from '@/providers/global-modal-provider';
import { useAppState } from '@/providers/app-state-provider/context';
-
import { IconButton } from '@/ui/button';
import useLocalStorage from '@/hooks/use-local-storage';
import usePageMetaList from '@/hooks/use-page-meta-list';
import { usePageHelper } from '@/hooks/use-page-helper';
+import { useTranslation } from 'react-i18next';
const FavoriteList = ({ showList }: { showList: boolean }) => {
const { openPage } = usePageHelper();
const pageList = usePageMetaList();
const router = useRouter();
-
+ const { t } = useTranslation();
const favoriteList = pageList.filter(p => p.favorite && !p.trash);
return (
@@ -59,7 +59,7 @@ const FavoriteList = ({ showList }: { showList: boolean }) => {
);
})}
{favoriteList.length === 0 && (
- No item
+ {t('No item')}
)}
);
@@ -70,7 +70,7 @@ export const WorkSpaceSliderBar = () => {
const { currentWorkspaceId } = useAppState();
const { openPage, createPage } = usePageHelper();
const router = useRouter();
-
+ const { t } = useTranslation();
const [showTip, setShowTip] = useState(false);
const [show, setShow] = useLocalStorage('AFFiNE_SLIDE_BAR', false, true);
@@ -86,7 +86,7 @@ export const WorkSpaceSliderBar = () => {
<>
@@ -109,9 +109,9 @@ export const WorkSpaceSliderBar = () => {
-
+ {/*
-
+ */}
{
}}
>
- Quick search
+ {t('Quick search')}
- All pages
+ {t('All pages')}
- Favourites
+ {t('Favourites')}
{
triggerImportModal();
}}
>
- Import
+ {t('Import')}
- Trash
+ {t('Trash')}
{
}
}}
>
- New Page
+ {t('New Page')}
diff --git a/packages/app/src/hooks/use-ensure-workspace.ts b/packages/app/src/hooks/use-ensure-workspace.ts
index a340b78a48..d20c63b05f 100644
--- a/packages/app/src/hooks/use-ensure-workspace.ts
+++ b/packages/app/src/hooks/use-ensure-workspace.ts
@@ -1,8 +1,8 @@
import { useState, useEffect } from 'react';
import { useAppState } from '@/providers/app-state-provider';
import { useRouter } from 'next/router';
-const defaultOutLineWorkspaceId =
- 'local-first-' + '85b4ca0b9081421d903bbc2501ea280f';
+const defaultOutLineWorkspaceId = 'affine';
+// 'local-first-' + '85b4ca0b9081421d903bbc2501ea280f';
// It is a fully effective hook
// Cause it not just ensure workspace loaded, but also have router change.
export const useEnsureWorkspace = () => {
diff --git a/packages/app/src/hooks/use-props-updated.ts b/packages/app/src/hooks/use-props-updated.ts
index d76ada43d2..1bbd8d2cd4 100644
--- a/packages/app/src/hooks/use-props-updated.ts
+++ b/packages/app/src/hooks/use-props-updated.ts
@@ -17,7 +17,7 @@ export const usePropsUpdated: UsePropsUpdated = () => {
return;
}
setTimeout(() => {
- editor.model?.propsUpdated.on(() => {
+ editor.pageBlockModel?.propsUpdated.on(() => {
callbackQueue.current.forEach(callback => {
callback(editor);
});
@@ -26,7 +26,7 @@ export const usePropsUpdated: UsePropsUpdated = () => {
return () => {
callbackQueue.current = [];
- editor?.model?.propsUpdated.dispose();
+ editor?.pageBlockModel?.propsUpdated?.dispose();
};
}, [editor]);
diff --git a/packages/app/src/libs/i18n/resources/en.json b/packages/app/src/libs/i18n/resources/en.json
index c2716448f7..9ce5282e71 100644
--- a/packages/app/src/libs/i18n/resources/en.json
+++ b/packages/app/src/libs/i18n/resources/en.json
@@ -1,28 +1,65 @@
{
- "Sync to Disk": "Sync to Disk",
- "Share": "Share",
- "WarningTips": {
- "IsNotfsApiSupported": "Welcome to the AFFiNE demo. To begin saving changes you can SYNC DATA TO DISK with the latest version of Chromium based browser like Chrome/Edge",
- "IsNotLocalWorkspace": "Welcome to the AFFiNE demo. To begin saving changes you can SYNC TO DISK.",
- "DoNotStore": "AFFiNE is under active development and the current version is UNSTABLE. Please DO NOT store information or data"
- },
- "Layout": "Layout",
- "Comment": "Comment",
- "Settings": "Settings",
- "ComingSoon": "Layout Settings Coming Soon...",
- "Duplicate Page": "Duplicate Page",
- "Copy Page Link": "Copy Page Link",
- "Language": "Language",
- "Clear Workspace": "Clear Workspace",
- "Export As Markdown": "Export As Markdown",
- "Export As HTML": "Export As HTML",
- "Export As PDF (Unsupported)": "Export As PDF (Unsupported)",
- "Import Workspace": "Import Workspace",
- "Export Workspace": "Export Workspace",
- "Last edited by": "Last edited by {{name}}",
- "Logout": "Logout",
+ "Quick search": "Quick search",
+ "All pages": "All pages",
+ "Favourites": "Favourites",
+ "No item": "No item",
+ "Import": "Import",
+ "Trash": "Trash",
+ "New Page": "New Page",
+ "New Keyword Page": "New '{{query}}' page",
+ "Find 0 result": "Find 0 result",
+ "Find results": "Find {{number}} results",
+ "Collapse sidebar": "Collapse sidebar",
+ "Expand sidebar": "Expand sidebar",
+ "Removed from Favourites": "Removed from Favourites",
+ "Remove from favourites": "Remove from favourites",
+ "Added to Favourites": "Added to Favourites",
+ "Add to favourites": "Add to favourites",
+ "Paper": "Paper",
+ "Edgeless": "Edgeless",
+ "Switch to": "Switch to",
+ "Convert to ": "Convert to ",
+ "Page": "Page",
+ "Export": "Export",
+ "Export to HTML": "Export to HTML",
+ "Export to Markdown": "Export to Markdown",
"Delete": "Delete",
- "Turn into": "Turn into",
- "Add A Below Block": "Add A Below Block",
- "Divide Here As A New Group": "Divide Here As A New Group"
+ "Title": "Title",
+ "Untitled": "Untitled",
+ "Created": "Created",
+ "Updated": "Updated",
+ "Open in new tab": "Open in new tab",
+ "Favourite": "Favourite",
+ "Favourited": "Favourited",
+ "Delete page?": "Delete page?",
+ "Delete permanently?": "Delete permanently?",
+ "will be moved to Trash": "{{title}} will be moved to Trash",
+ "Once deleted, you can't undo this action.": "Once deleted,you can't undo this action.",
+ "Moved to Trash": "Moved to Trash",
+ "Permanently deleted": "Permanently deleted",
+ "restored": "{{title}} restored",
+ "Cancel": "Cancel",
+ "Keyboard Shortcuts": "Keyboard Shortcuts",
+ "Contact Us": "Contact Us",
+ "Official Website": "Official Website",
+ "Get in touch!": "Get in touch!",
+ "AFFiNE Community": "AFFiNE Community",
+ "How is AFFiNE Alpha different?": "How is AFFiNE Alpha different?",
+ "Shortcuts": "Shortcuts",
+ "Undo": "Undo",
+ "Redo": "Redo",
+ "Bold": "Bold",
+ "Italic": "Italic",
+ "Underline": "Underline",
+ "Strikethrough": "Strikethrough",
+ "Inline code": "Inline code",
+ "Code block": "Code block",
+ "Link": "Link",
+ "Body text": "Body text",
+ "Heading": "Heading {{number}}",
+ "Increase indent": "Increase indent",
+ "Reduce indent": "Reduce indent",
+ "Markdown Syntax": "Markdown Syntax",
+ "Divider": "Divider",
+ "404 - Page Not Found": "404 - Page Not Found"
}
diff --git a/packages/app/src/pages/_app.tsx b/packages/app/src/pages/_app.tsx
index bb56e9acef..c7cbd78d4b 100644
--- a/packages/app/src/pages/_app.tsx
+++ b/packages/app/src/pages/_app.tsx
@@ -18,6 +18,7 @@ import { useEffect } from 'react';
import { useAppState } from '@/providers/app-state-provider';
import { PageLoading } from '@/components/loading';
import Head from 'next/head';
+import '@/libs/i18n';
const ThemeProvider = dynamic(() => import('@/providers/themeProvider'), {
ssr: false,
diff --git a/packages/app/src/pages/playground/templates.tsx b/packages/app/src/pages/playground/templates.tsx
index 0517498878..a83d25e516 100644
--- a/packages/app/src/pages/playground/templates.tsx
+++ b/packages/app/src/pages/playground/templates.tsx
@@ -43,12 +43,16 @@ const All = () => {
if (page) {
currentWorkspace?.setPageMeta(page.id, { title });
if (page && page.root === null) {
- setTimeout(() => {
+ setTimeout(async () => {
const editor = document.querySelector('editor-container');
if (editor) {
- const groupId = page.addBlock({ flavour: 'affine:group' }, pageId);
+ page.addBlock({ flavour: 'affine:surface' }, null);
+ const frameId = page.addBlock({ flavour: 'affine:frame' }, pageId);
// TODO blocksuite should offer a method to import markdown from store
- editor.clipboard.importMarkdown(template.source, `${groupId}`);
+ await editor.clipboard.importMarkdown(
+ template.source,
+ `${frameId}`
+ );
page.resetHistory();
editor.requestUpdate();
}
diff --git a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx
index 971e950f8b..05c2c17eba 100644
--- a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx
+++ b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx
@@ -1,10 +1,10 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion */
import {
- useRef,
- useEffect,
- useState,
- ReactElement,
PropsWithChildren,
+ ReactElement,
+ useEffect,
+ useRef,
+ useState,
} from 'react';
import { styled } from '@/styles';
import { EditorHeader } from '@/components/header';
@@ -16,9 +16,11 @@ import type { NextPageWithLayout } from '../..//_app';
import WorkspaceLayout from '@/components/workspace-layout';
import { useRouter } from 'next/router';
import { usePageHelper } from '@/hooks/use-page-helper';
+
const StyledEditorContainer = styled('div')(() => {
return {
height: 'calc(100vh - 60px)',
+ padding: '0 32px',
};
});
@@ -54,15 +56,20 @@ const Page: NextPageWithLayout = () => {
flavour: 'affine:page',
title,
});
- const groupId = currentPage!.addBlock(
- { flavour: 'affine:group' },
+ currentPage!.addBlock({ flavour: 'affine:surface' }, null);
+ const frameId = currentPage!.addBlock(
+ { flavour: 'affine:frame' },
pageId
);
- currentPage!.addBlock({ flavour: 'affine:group' }, pageId);
+ currentPage!.addBlock({ flavour: 'affine:frame' }, pageId);
// If this is a first page in workspace, init an introduction markdown
if (isFirstPage) {
- editor.clipboard.importMarkdown(exampleMarkdown, `${groupId}`);
- currentWorkspace!.setPageMeta(currentPage!.id, { title });
+ editor.clipboard
+ .importMarkdown(exampleMarkdown, `${frameId}`)
+ .then(() => {
+ currentWorkspace!.setPageMeta(currentPage!.id, { title });
+ currentPage!.resetHistory();
+ });
}
currentPage!.resetHistory();
}
diff --git a/packages/app/src/pages/workspace/[workspaceId]/all.tsx b/packages/app/src/pages/workspace/[workspaceId]/all.tsx
index dacb16bd59..18f6e2a64b 100644
--- a/packages/app/src/pages/workspace/[workspaceId]/all.tsx
+++ b/packages/app/src/pages/workspace/[workspaceId]/all.tsx
@@ -4,13 +4,13 @@ import usePageMetaList from '@/hooks/use-page-meta-list';
import { PageListHeader } from '@/components/header';
import { ReactElement } from 'react';
import WorkspaceLayout from '@/components/workspace-layout';
-
+import { useTranslation } from 'react-i18next';
const All = () => {
const pageMetaList = usePageMetaList();
-
+ const { t } = useTranslation();
return (
<>
- }>All Page
+ }>{t('All pages')}
!p.trash)}
showFavoriteTag={true}
diff --git a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx b/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx
index bde04923d6..d787f34e1b 100644
--- a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx
+++ b/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx
@@ -4,12 +4,15 @@ import { FavouritesIcon } from '@blocksuite/icons';
import usePageMetaList from '@/hooks/use-page-meta-list';
import { ReactElement } from 'react';
import WorkspaceLayout from '@/components/workspace-layout';
-
+import { useTranslation } from 'react-i18next';
export const Favorite = () => {
const pageMetaList = usePageMetaList();
+ const { t } = useTranslation();
return (
<>
- }>Favourites
+ }>
+ {t('Favourites')}
+
p.favorite && !p.trash)} />
);
diff --git a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx b/packages/app/src/pages/workspace/[workspaceId]/trash.tsx
index 9e7f397669..2343b39138 100644
--- a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx
+++ b/packages/app/src/pages/workspace/[workspaceId]/trash.tsx
@@ -4,12 +4,13 @@ import { TrashIcon } from '@blocksuite/icons';
import usePageMetaList from '@/hooks/use-page-meta-list';
import { ReactElement } from 'react';
import WorkspaceLayout from '@/components/workspace-layout';
-
+import { useTranslation } from 'react-i18next';
export const Trash = () => {
const pageMetaList = usePageMetaList();
+ const { t } = useTranslation();
return (
<>
- }>Trash
+ }>{t('Trash')}
p.trash)} isTrash={true} />
);
diff --git a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx
index 3a8fb7671c..1875a35557 100644
--- a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx
+++ b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx
@@ -18,7 +18,7 @@ const DynamicBlocksuite = ({
const openWorkspace: LoadWorkspaceHandler = async (workspaceId: string) => {
if (workspaceId) {
const dc = await getDataCenter();
- return dc.load(workspaceId, { providerId: 'affine' });
+ return dc.load(workspaceId, { providerId: 'selfhosted' });
} else {
return null;
}
diff --git a/packages/app/src/templates/Welcome-to-AFFiNE-Alpha-v2.0.md b/packages/app/src/templates/Welcome-to-AFFiNE-Alpha-v2.0.md
index 8493d51149..6495135903 100644
--- a/packages/app/src/templates/Welcome-to-AFFiNE-Alpha-v2.0.md
+++ b/packages/app/src/templates/Welcome-to-AFFiNE-Alpha-v2.0.md
@@ -10,6 +10,11 @@ Let us know what you think of this latest version.
2. More complete Markdown support and improved keyboard shortcuts;
3. New features such as dark mode; Switch between view styles using the ☀ and 🌙.
4. Clean and modern UI/UX design.
+5. You can self-host locally with Docker.
+
+```basic
+docker run -d -v [YOUR_PATH]:/app/data -p 3000:3000 ghcr.io/toeverything/affine-self-hosted:alpha-abbey-wood
+```
**Looking for Markdown syntax or keyboard shortcuts?**
@@ -23,15 +28,21 @@ Let us know what you think of this latest version.
- Copy and paste **images** into your pages, resize them and add captions
- Add horizontal line dividers to your text with `---` and `***`
- Changes are saved **locally**, but we still recommend you export your data to avoid data loss
-- Insert code blocks with syntax highlighting support using ```
+- Insert code blocks with syntax highlighting support using `````
### Playground:
-[] Try a horiztaonl line: `---`
+[] Try a horizontal line: `---`
-[] What about a code block? ```
+[] What about a code block? `````
- console.log('Hello world');
+```javascript
+console.log('Hello world');
+```
+
+[] Can you resize this image?
+
+
**How about page management?**
diff --git a/packages/app/src/ui/confirm/Confirm.tsx b/packages/app/src/ui/confirm/Confirm.tsx
index d3de35adb1..bbffe75f65 100644
--- a/packages/app/src/ui/confirm/Confirm.tsx
+++ b/packages/app/src/ui/confirm/Confirm.tsx
@@ -7,6 +7,7 @@ import {
StyledModalWrapper,
} from '@/ui/confirm/styles';
import { Button } from '@/ui/button';
+import { useTranslation } from 'react-i18next';
export type ConfirmProps = {
title?: string;
content?: string;
@@ -26,6 +27,7 @@ export const Confirm = ({
onCancel,
}: ConfirmProps) => {
const [open, setOpen] = useState(true);
+ const { t } = useTranslation();
return (
@@ -48,7 +50,7 @@ export const Confirm = ({
}}
style={{ marginRight: '24px' }}
>
- Cancel
+ {t('Cancel')}