From 50f19663d45e1d02f75e4579dfdad8ea0a2b01c6 Mon Sep 17 00:00:00 2001
From: himself65 <himself65@outlook.com>
Date: Mon, 2 Jan 2023 00:57:08 +0800
Subject: [PATCH 1/9] build: enhance debugging with blocksuite

---
 packages/app/next.config.js | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/app/next.config.js b/packages/app/next.config.js
index 20f12e5770..6d7225864c 100644
--- a/packages/app/next.config.js
+++ b/packages/app/next.config.js
@@ -4,6 +4,11 @@ const { dependencies } = require('./package.json');
 const path = require('node:path');
 const printer = require('./scripts/printer').printer;
 
+const enableDebugLocal = path.isAbsolute(process.env.LOCAL_BLOCK_SUITE ?? '');
+const EDITOR_VERSION = enableDebugLocal
+  ? 'local-version'
+  : dependencies['@blocksuite/editor'];
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   productionBrowserSourceMaps: true,
@@ -16,7 +21,7 @@ const nextConfig = {
     CI: process.env.CI || null,
     VERSION: getGitVersion(),
     COMMIT_HASH: getCommitHash(),
-    EDITOR_VERSION: dependencies['@blocksuite/editor'],
+    EDITOR_VERSION,
   },
   webpack: config => {
     config.experiments = { ...config.experiments, topLevelAwait: true };
@@ -63,11 +68,25 @@ const baseDir = process.env.LOCAL_BLOCK_SUITE ?? '/';
 const withDebugLocal = require('next-debug-local')(
   {
     '@blocksuite/editor': path.resolve(baseDir, 'packages', 'editor'),
+    '@blocksuite/blocks/models': path.resolve(
+      baseDir,
+      'packages',
+      'blocks',
+      'src',
+      'models'
+    ),
+    '@blocksuite/blocks/std': path.resolve(
+      baseDir,
+      'packages',
+      'blocks',
+      'src',
+      'std'
+    ),
     '@blocksuite/blocks': path.resolve(baseDir, 'packages', 'blocks'),
     '@blocksuite/store': path.resolve(baseDir, 'packages', 'store'),
   },
   {
-    enable: path.isAbsolute(process.env.LOCAL_BLOCK_SUITE ?? ''),
+    enable: enableDebugLocal,
   }
 );
 

From 1bc2dcd6610eec24d60517c2ccadb0d2b86223ae Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Wed, 4 Jan 2023 16:57:21 +0800
Subject: [PATCH 2/9] feat: init i18n

---
 packages/app/src/libs/i18n/resources/en.json | 87 ++++++++++++++------
 packages/app/src/pages/_app.tsx              |  1 +
 2 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/packages/app/src/libs/i18n/resources/en.json b/packages/app/src/libs/i18n/resources/en.json
index c2716448f7..45822ea009 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 to Favourites": "Removed to Favourites",
+  "Remove to favourites": "Remove to 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,

From 0b61f4a2a04a83d3dd3616aaf87d649330ae51ba Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Wed, 4 Jan 2023 17:10:47 +0800
Subject: [PATCH 3/9] feat: add translation

---
 packages/app/src/components/404/index.tsx     |  5 +--
 .../src/components/contact-modal/index.tsx    | 35 +++++++++---------
 .../components/editor-mode-switch/index.tsx   |  8 ++---
 .../header-right-items/editor-option-menu.tsx | 30 +++++++++-------
 .../components/header/quick-search-button.tsx |  6 ++--
 .../app/src/components/help-island/index.tsx  |  7 ++--
 packages/app/src/components/import/index.tsx  |  4 ++-
 .../components/page-list/operation-cell.tsx   | 36 ++++++++++---------
 .../src/components/quick-search/footer.tsx    |  7 ++--
 .../src/components/quick-search/results.tsx   | 10 ++++--
 .../src/components/shortcuts-modal/index.tsx  | 16 +++++----
 .../components/workspace-slider-bar/index.tsx | 22 ++++++------
 .../src/pages/workspace/[workspaceId]/all.tsx |  6 ++--
 .../workspace/[workspaceId]/favorite.tsx      |  7 ++--
 .../pages/workspace/[workspaceId]/trash.tsx   |  5 +--
 packages/app/src/ui/confirm/Confirm.tsx       |  4 ++-
 16 files changed, 118 insertions(+), 90 deletions(-)

diff --git a/packages/app/src/components/404/index.tsx b/packages/app/src/components/404/index.tsx
index e2f828ad9f..7df644bbfe 100644
--- a/packages/app/src/components/404/index.tsx
+++ b/packages/app/src/components/404/index.tsx
@@ -1,9 +1,10 @@
 import { NotFoundTitle, PageContainer } from './styles';
-
+import { useTranslation } from 'react-i18next';
 export const NotfoundPage = () => {
+  const { t } = useTranslation();
   return (
     <PageContainer>
-      <NotFoundTitle>404 - Page Not Found</NotFoundTitle>
+      <NotFoundTitle>{t('404 - Page Not Found')}</NotFoundTitle>
     </PageContainer>
   );
 };
diff --git a/packages/app/src/components/contact-modal/index.tsx b/packages/app/src/components/contact-modal/index.tsx
index a182f3e047..50c1e1b530 100644
--- a/packages/app/src/components/contact-modal/index.tsx
+++ b/packages/app/src/components/contact-modal/index.tsx
@@ -23,7 +23,7 @@ import {
   StyledModalFooter,
 } from './style';
 import bg from '@/components/contact-modal/bg.png';
-
+import { useTranslation } from 'react-i18next';
 const linkList = [
   {
     icon: <GithubIcon />,
@@ -51,20 +51,6 @@ const linkList = [
     link: 'https://discord.gg/Arn7TqJBvG',
   },
 ];
-const rightLinkList = [
-  {
-    icon: <LogoIcon />,
-    title: 'Official Website ',
-    subTitle: 'AFFiNE.pro',
-    link: 'https://affine.pro',
-  },
-  {
-    icon: <DocIcon />,
-    title: 'AFFiNE Community',
-    subTitle: 'community.affine.pro',
-    link: 'https://community.affine.pro',
-  },
-];
 
 type TransitionsModalProps = {
   open: boolean;
@@ -72,6 +58,21 @@ type TransitionsModalProps = {
 };
 
 export const ContactModal = ({ open, onClose }: TransitionsModalProps) => {
+  const { t } = useTranslation();
+  const rightLinkList = [
+    {
+      icon: <LogoIcon />,
+      title: t('Official Website'),
+      subTitle: 'AFFiNE.pro',
+      link: 'https://affine.pro',
+    },
+    {
+      icon: <DocIcon />,
+      title: t('AFFiNE Community'),
+      subTitle: 'community.affine.pro',
+      link: 'https://community.affine.pro',
+    },
+  ];
   return (
     <Modal open={open} onClose={onClose} data-testid="contact-us-modal-content">
       <ModalWrapper
@@ -109,7 +110,7 @@ export const ContactModal = ({ open, onClose }: TransitionsModalProps) => {
             })}
           </StyledLeftContainer>
           <StyledRightContainer>
-            <StyledSubTitle>Get in touch!</StyledSubTitle>
+            <StyledSubTitle>{t('Get in touch!')}</StyledSubTitle>
             {linkList.map(({ icon, title, link }) => {
               return (
                 <StyledSmallLink key={title} href={link} target="_blank">
@@ -128,7 +129,7 @@ export const ContactModal = ({ open, onClose }: TransitionsModalProps) => {
               target="_blank"
               rel="noreferrer"
             >
-              How is AFFiNE Alpha different？
+              {t('How is AFFiNE Alpha different?')}
             </a>
           </p>
           <p>Copyright &copy; 2022 Toeverything</p>
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 (
     <StyledAnimateRadioContainer
       data-testid="editor-mode-switcher"
@@ -106,7 +106,7 @@ export const EditorModeSwitch = ({
     >
       <AnimateRadioItem
         isLeft={true}
-        label="Paper"
+        label={t('Paper')}
         icon={<PaperItem />}
         active={mode === 'page'}
         status={radioItemStatus.left}
@@ -126,7 +126,7 @@ export const EditorModeSwitch = ({
       <StyledMiddleLine hidden={!isHover} dark={themeMode === 'dark'} />
       <AnimateRadioItem
         isLeft={false}
-        label="Edgeless"
+        label={t('Edgeless')}
         data-testid="switch-edgeless-item"
         icon={<EdgelessItem />}
         active={mode === 'edgeless'}
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..738e344d48 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 to Favourites') : t('Added to Favourites')
+          );
         }}
         icon={favorite ? <FavouritedIcon /> : <FavouritesIcon />}
       >
-        {favorite ? 'Remove' : 'Add'} to favourites
+        {favorite ? t('Remove to favourites') : t('Add to favourites')}
       </MenuItem>
       <MenuItem
         icon={mode === 'page' ? <EdgelessIcon /> : <PaperIcon />}
@@ -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')}
       </MenuItem>
       <Menu
         placement="left-start"
@@ -60,7 +64,7 @@ const PopoverContent = () => {
               }}
               icon={<ExportToHtmlIcon />}
             >
-              Export to HTML
+              {t('Export to HTML')}
             </MenuItem>
             <MenuItem
               onClick={() => {
@@ -68,31 +72,33 @@ const PopoverContent = () => {
               }}
               icon={<ExportToMarkdownIcon />}
             >
-              Export to Markdown
+              {t('Export to Markdown')}
             </MenuItem>
           </>
         }
       >
         <MenuItem icon={<ExportIcon />} isDir={true}>
-          Export
+          {t('Export')}
         </MenuItem>
       </Menu>
       <MenuItem
         data-testid="editor-option-menu-delete"
         onClick={() => {
           confirm({
-            title: 'Delete page?',
-            content: `${title || 'Untitled'} will be moved to Trash`,
-            confirmText: 'Delete',
+            title: t('Delete page?'),
+            content: t('will be moved to Trash', {
+              title: title || 'Untitled',
+            }),
+            confirmText: t('Delete'),
             confirmType: 'danger',
           }).then(confirm => {
             confirm && toggleDeletePage(id);
-            confirm && toast('Moved to Trash');
+            confirm && toast(t('Moved to Trash'));
           });
         }}
         icon={<TrashIcon />}
       >
-        Delete
+        {t('Delete')}
       </MenuItem>
     </>
   );
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<IconButtonProps, 'children'>) => {
   const { triggerQuickSearchModal } = useModal();
-
+  const { t } = useTranslation();
   return (
-    <Tooltip content="Switch to" placement="bottom">
+    <Tooltip content={t('Switch to')} placement="bottom">
       <IconButton
         data-testid="header-quickSearchButton"
         {...props}
diff --git a/packages/app/src/components/help-island/index.tsx b/packages/app/src/components/help-island/index.tsx
index 351b63289e..64ef678d8c 100644
--- a/packages/app/src/components/help-island/index.tsx
+++ b/packages/app/src/components/help-island/index.tsx
@@ -8,6 +8,7 @@ import {
 import { CloseIcon, ContactIcon, HelpIcon, KeyboardIcon } from './icons';
 import Grow from '@mui/material/Grow';
 import { Tooltip } from '@/ui/tooltip';
+import { useTranslation } from 'react-i18next';
 import { useModal } from '@/providers/global-modal-provider';
 import { useTheme } from '@/providers/themeProvider';
 import useCurrentPageMeta from '@/hooks/use-current-page-meta';
@@ -22,7 +23,7 @@ export const HelpIsland = ({
   const { mode: editorMode } = useCurrentPageMeta() || {};
   const { triggerShortcutsModal, triggerContactModal } = useModal();
   const isEdgelessDark = mode === 'dark' && editorMode === 'edgeless';
-
+  const { t } = useTranslation();
   return (
     <>
       <StyledIsland
@@ -37,7 +38,7 @@ export const HelpIsland = ({
         <Grow in={showContent}>
           <StyledIslandWrapper>
             {showList.includes('contact') && (
-              <Tooltip content="Contact Us" placement="left-end">
+              <Tooltip content={t('Contact Us')} placement="left-end">
                 <StyledIconWrapper
                   data-testid="right-bottom-contact-us-icon"
                   isEdgelessDark={isEdgelessDark}
@@ -51,7 +52,7 @@ export const HelpIsland = ({
               </Tooltip>
             )}
             {showList.includes('shortcuts') && (
-              <Tooltip content="Keyboard Shortcuts" placement="left-end">
+              <Tooltip content={t('Keyboard Shortcuts')} placement="left-end">
                 <StyledIconWrapper
                   data-testid="shortcuts-icon"
                   isEdgelessDark={isEdgelessDark}
diff --git a/packages/app/src/components/import/index.tsx b/packages/app/src/components/import/index.tsx
index aa9714e22b..7387cb5de6 100644
--- a/packages/app/src/components/import/index.tsx
+++ b/packages/app/src/components/import/index.tsx
@@ -6,6 +6,7 @@ import Loading from '@/components/loading';
 import { usePageHelper } from '@/hooks/use-page-helper';
 import { useAppState } from '@/providers/app-state-provider/context';
 import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 // import { Tooltip } from '@/ui/tooltip';
 type ImportModalProps = {
   open: boolean;
@@ -19,6 +20,7 @@ export const ImportModal = ({ open, onClose }: ImportModalProps) => {
   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);
 
@@ -84,7 +86,7 @@ export const ImportModal = ({ open, onClose }: ImportModalProps) => {
     <Modal open={open} onClose={onClose}>
       <ModalWrapper width={460} minHeight={240}>
         <ModalCloseButton onClick={onClose} />
-        <StyledTitle>Import</StyledTitle>
+        <StyledTitle>{t('Import')}</StyledTitle>
 
         {status === 'unImported' && (
           <StyledButtonWrapper>
diff --git a/packages/app/src/components/page-list/operation-cell.tsx b/packages/app/src/components/page-list/operation-cell.tsx
index 7416b65d9a..3052199c4d 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 = (
     <>
       <MenuItem
         onClick={() => {
           toggleFavoritePage(id);
-          toast(!favorite ? 'Removed to Favourites' : 'Added to Favourites');
+          toast(
+            !favorite ? t('Removed to Favourites') : t('Added to Favourites')
+          );
         }}
         icon={favorite ? <FavouritedIcon /> : <FavouritesIcon />}
       >
-        {favorite ? 'Remove' : 'Add'} to favourites
+        {favorite ? t('Remove to favourites') : t('Add to favourites')}
       </MenuItem>
       <MenuItem
         onClick={() => {
@@ -38,23 +40,25 @@ export const OperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => {
         }}
         icon={<OpenInNewIcon />}
       >
-        Open in new tab
+        {t('Open in new tab')}
       </MenuItem>
       <MenuItem
         onClick={() => {
           confirm({
-            title: 'Delete page?',
-            content: `${pageMeta.title || 'Untitled'} will be moved to Trash`,
-            confirmText: 'Delete',
+            title: t('Delete page?'),
+            content: t('will be moved to Trash', {
+              title: pageMeta.title || 'Untitled',
+            }),
+            confirmText: t('Delete'),
             confirmType: 'danger',
           }).then(confirm => {
             confirm && toggleDeletePage(id);
-            toast('Moved to Trash');
+            toast(t('Moved to Trash'));
           });
         }}
         icon={<TrashIcon />}
       >
-        Delete
+        {t('Delete')}
       </MenuItem>
     </>
   );
@@ -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 (
     <Wrapper>
       <IconButton
@@ -82,7 +86,7 @@ export const TrashOperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => {
         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/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 }) => {
       <StyledModalFooterContent>
         <AddIcon />
         {query ? (
-          <span>New &quot;{query}&quot; page</span>
+          <span>{t('New Keyword Page', { query: query })}</span>
         ) : (
-          <span>New page</span>
+          <span>{t('New Page')}</span>
         )}
       </StyledModalFooterContent>
     </Command.Item>
diff --git a/packages/app/src/components/quick-search/results.tsx b/packages/app/src/components/quick-search/results.tsx
index 2a99e389ff..2c2abd9026 100644
--- a/packages/app/src/components/quick-search/results.tsx
+++ b/packages/app/src/components/quick-search/results.tsx
@@ -7,6 +7,7 @@ import { useAppState } from '@/providers/app-state-provider';
 import { useRouter } from 'next/router';
 import { config } 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: {
@@ -27,6 +28,7 @@ export const Results = (props: {
   const { search } = usePageHelper();
   const List = config(currentWorkspaceId);
   const [results, setResults] = useState(new Map<string, string | undefined>());
+  const { t } = useTranslation();
   useEffect(() => {
     setResults(search(query));
     setLoading(false);
@@ -47,7 +49,9 @@ export const Results = (props: {
     <>
       {query ? (
         resultsPageMeta.length ? (
-          <Command.Group heading={`Find ${resultsPageMeta.length} results`}>
+          <Command.Group
+            heading={t('Find results', { number: resultsPageMeta.length })}
+          >
             {resultsPageMeta.map(result => {
               return (
                 <Command.Item
@@ -72,12 +76,12 @@ export const Results = (props: {
           </Command.Group>
         ) : (
           <StyledNotFound>
-            <span>Find 0 result</span>
+            <span>{t('Find 0 result')}</span>
             <NoResultSVG />
           </StyledNotFound>
         )
       ) : (
-        <Command.Group heading="Switch to">
+        <Command.Group heading={t('Switch to')}>
           {List.map(link => {
             return (
               <Command.Item
diff --git a/packages/app/src/components/shortcuts-modal/index.tsx b/packages/app/src/components/shortcuts-modal/index.tsx
index 63a4246d64..9a9133e88b 100644
--- a/packages/app/src/components/shortcuts-modal/index.tsx
+++ b/packages/app/src/components/shortcuts-modal/index.tsx
@@ -16,6 +16,7 @@ import {
 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;
@@ -27,11 +28,12 @@ const isMac = () => {
 
 export const ShortcutsModal = ({ open, onClose }: ModalProps) => {
   const markdownShortcuts = isMac()
-    ? macMarkdownShortcuts
-    : winMarkdownShortcuts;
+    ? macMarkdownShortcuts()
+    : winMarkdownShortcuts();
   const keyboardShortcuts = isMac()
-    ? macKeyboardShortcuts
-    : windowsKeyboardShortcuts;
+    ? macKeyboardShortcuts()
+    : windowsKeyboardShortcuts();
+  const { t } = useTranslation();
   return createPortal(
     <Slide direction="left" in={open} mountOnEnter unmountOnExit>
       <StyledShortcutsModal data-testid="shortcuts-modal">
@@ -39,7 +41,7 @@ export const ShortcutsModal = ({ open, onClose }: ModalProps) => {
           <StyledModalHeader>
             <StyledTitle>
               <KeyboardIcon />
-              Shortcuts
+              {t('Shortcuts')}
             </StyledTitle>
 
             <ModalCloseButton
@@ -53,7 +55,7 @@ export const ShortcutsModal = ({ open, onClose }: ModalProps) => {
             />
           </StyledModalHeader>
           <StyledSubTitle style={{ marginTop: 0 }}>
-            Keyboard Shortcuts
+            {t('Keyboard Shortcuts')}
           </StyledSubTitle>
           {Object.entries(keyboardShortcuts).map(([title, shortcuts]) => {
             return (
@@ -63,7 +65,7 @@ export const ShortcutsModal = ({ open, onClose }: ModalProps) => {
               </StyledListItem>
             );
           })}
-          <StyledSubTitle>Markdown Syntax</StyledSubTitle>
+          <StyledSubTitle>{t('Markdown Syntax')}</StyledSubTitle>
           {Object.entries(markdownShortcuts).map(([title, shortcuts]) => {
             return (
               <StyledListItem key={title}>
diff --git a/packages/app/src/components/workspace-slider-bar/index.tsx b/packages/app/src/components/workspace-slider-bar/index.tsx
index 4d164e4233..0924752ac2 100644
--- a/packages/app/src/components/workspace-slider-bar/index.tsx
+++ b/packages/app/src/components/workspace-slider-bar/index.tsx
@@ -25,18 +25,18 @@ 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 { WorkspaceSelector } from './WorkspaceSelector';
 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 (
     <Collapse in={showList}>
@@ -59,7 +59,7 @@ const FavoriteList = ({ showList }: { showList: boolean }) => {
         );
       })}
       {favoriteList.length === 0 && (
-        <StyledSubListItem disable={true}>No item</StyledSubListItem>
+        <StyledSubListItem disable={true}>{t('No item')}</StyledSubListItem>
       )}
     </Collapse>
   );
@@ -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 = () => {
     <>
       <StyledSliderBar show={show}>
         <Tooltip
-          content={show ? 'Collapse sidebar' : 'Expand sidebar'}
+          content={show ? t('Collapse sidebar') : t('Expand sidebar')}
           placement="right"
           visible={showTip}
         >
@@ -120,17 +120,17 @@ export const WorkSpaceSliderBar = () => {
             }}
           >
             <SearchIcon />
-            Quick search
+            {t('Quick search')}
           </StyledListItem>
           <Link href={{ pathname: paths.all }}>
             <StyledListItem active={router.asPath === paths.all}>
-              <AllPagesIcon /> <span>All pages</span>
+              <AllPagesIcon /> <span>{t('All pages')}</span>
             </StyledListItem>
           </Link>
           <StyledListItem active={router.asPath === paths.favorite}>
             <StyledLink href={{ pathname: paths.favorite }}>
               <FavouritesIcon />
-              Favourites
+              {t('Favourites')}
             </StyledLink>
             <IconButton
               darker={true}
@@ -152,12 +152,12 @@ export const WorkSpaceSliderBar = () => {
               triggerImportModal();
             }}
           >
-            <ImportIcon /> Import
+            <ImportIcon /> {t('Import')}
           </StyledListItem>
 
           <Link href={{ pathname: paths.trash }}>
             <StyledListItem active={router.asPath === paths.trash}>
-              <TrashIcon /> Trash
+              <TrashIcon /> {t('Trash')}
             </StyledListItem>
           </Link>
           <StyledNewPageButton
@@ -168,7 +168,7 @@ export const WorkSpaceSliderBar = () => {
               }
             }}
           >
-            <AddIcon /> New Page
+            <AddIcon /> {t('New Page')}
           </StyledNewPageButton>
         </StyledSliderBarWrapper>
       </StyledSliderBar>
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 (
     <>
-      <PageListHeader icon={<AllPagesIcon />}>All Page</PageListHeader>
+      <PageListHeader icon={<AllPagesIcon />}>{t('All pages')}</PageListHeader>
       <PageList
         pageList={pageMetaList.filter(p => !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 (
     <>
-      <PageListHeader icon={<FavouritesIcon />}>Favourites</PageListHeader>
+      <PageListHeader icon={<FavouritesIcon />}>
+        {t('Favourites')}
+      </PageListHeader>
       <PageList pageList={pageMetaList.filter(p => 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 (
     <>
-      <PageListHeader icon={<TrashIcon />}>Trash</PageListHeader>
+      <PageListHeader icon={<TrashIcon />}>{t('Trash')}</PageListHeader>
       <PageList pageList={pageMetaList.filter(p => p.trash)} isTrash={true} />
     </>
   );
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 (
     <Modal open={open}>
       <StyledModalWrapper>
@@ -48,7 +50,7 @@ export const Confirm = ({
             }}
             style={{ marginRight: '24px' }}
           >
-            Cancel
+            {t('Cancel')}
           </Button>
           <Button
             type={confirmType}

From 1e27b2a6196408c1174c6698efb92ddfac2c5521 Mon Sep 17 00:00:00 2001
From: lawvs <18554747+lawvs@users.noreply.github.com>
Date: Wed, 4 Jan 2023 16:13:40 +0800
Subject: [PATCH 4/9] test: wait for page to load

---
 tests/console.spec.ts   | 5 +----
 tests/libs/load-page.ts | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/console.spec.ts b/tests/console.spec.ts
index 708ab965cf..62df984d49 100644
--- a/tests/console.spec.ts
+++ b/tests/console.spec.ts
@@ -12,10 +12,7 @@ test.describe('web console', () => {
     //Later on, call this function with some arguments.
     // const msg = await getEditoVersionHandle.evaluate((post, args) => post);
     // console.log(getEditoVersionHandle);
-    await page.waitForTimeout(500);
-    const editoVersion = await page.evaluate(
-      () => (window as any).__editoVersion
-    );
+    const editoVersion = await page.evaluate(() => window.__editoVersion);
     // const documentEditorVersion = await page.inputValue('input#editor-version');
     const pkgEditorVersion = pkg.dependencies['@blocksuite/editor'];
 
diff --git a/tests/libs/load-page.ts b/tests/libs/load-page.ts
index 002341de65..8428f27ec8 100644
--- a/tests/libs/load-page.ts
+++ b/tests/libs/load-page.ts
@@ -4,6 +4,6 @@ export function loadPage() {
   test.beforeEach(async ({ page }) => {
     await page.goto('http://localhost:8080');
     // waiting for page loading end
-    // await page.waitForTimeout(1000);
+    await page.waitForSelector('#__next');
   });
 }

From 59b084c6a694cdd79508bc7784f5d7587f4db1b0 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Wed, 4 Jan 2023 18:07:21 +0800
Subject: [PATCH 5/9] feat: add translation

---
 .../app/src/components/page-list/index.tsx    |  18 ++-
 .../app/src/components/quick-search/config.ts |  11 +-
 .../src/components/quick-search/results.tsx   |   4 +-
 .../src/components/shortcuts-modal/config.ts  | 144 ++++++++++--------
 .../src/components/shortcuts-modal/index.tsx  |  25 +--
 5 files changed, 113 insertions(+), 89 deletions(-)

diff --git a/packages/app/src/components/page-list/index.tsx b/packages/app/src/components/page-list/index.tsx
index f63fa39944..a4c7b8dbde 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 (
     <Tooltip
-      content={favorite ? 'Favourited' : 'Favourite'}
+      content={favorite ? t('Favourited') : t('Favourite')}
       placement="top-start"
     >
       <IconButton
@@ -43,7 +44,9 @@ const FavoriteTag = ({
         onClick={e => {
           e.stopPropagation();
           toggleFavoritePage(id);
-          toast(!favorite ? 'Removed to Favourites' : 'Added to Favourites');
+          toast(
+            !favorite ? t('Removed to 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 <Empty />;
   }
@@ -80,10 +84,10 @@ export const PageList = ({
       <Table>
         <TableHead>
           <TableRow>
-            <TableCell proportion={0.5}>Title</TableCell>
-            <TableCell proportion={0.2}>Created</TableCell>
+            <TableCell proportion={0.5}>{t('Title')}</TableCell>
+            <TableCell proportion={0.2}>{t('Created')}</TableCell>
             <TableCell proportion={0.2}>
-              {isTrash ? 'Moved to Trash' : 'Updated'}
+              {isTrash ? t('Moved to Trash') : t('Updated')}
             </TableCell>
             <TableCell proportion={0.1}></TableCell>
           </TableRow>
@@ -108,7 +112,7 @@ export const PageList = ({
                         <PaperIcon />
                       )}
                       <Content ellipsis={true} color="inherit">
-                        {pageMeta.title || 'Untitled'}
+                        {pageMeta.title || t('Untitled')}
                       </Content>
                     </StyledTitleLink>
                     {showFavoriteTag && <FavoriteTag pageMeta={pageMeta} />}
diff --git a/packages/app/src/components/quick-search/config.ts b/packages/app/src/components/quick-search/config.ts
index 7c5b8afe72..c5171f06c7 100644
--- a/packages/app/src/components/quick-search/config.ts
+++ b/packages/app/src/components/quick-search/config.ts
@@ -1,21 +1,22 @@
 import { AllPagesIcon, FavouritesIcon, TrashIcon } from '@blocksuite/icons';
-
-export const config = (currentWorkspaceId: string) => {
+import { useTranslation } from 'react-i18next';
+export const useSwitchToConfig = (currentWorkspaceId: string) => {
+  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/results.tsx b/packages/app/src/components/quick-search/results.tsx
index 2c2abd9026..eeb9fc2d44 100644
--- a/packages/app/src/components/quick-search/results.tsx
+++ b/packages/app/src/components/quick-search/results.tsx
@@ -5,7 +5,7 @@ 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';
@@ -26,7 +26,7 @@ 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<string, string | undefined>());
   const { t } = useTranslation();
   useEffect(() => {
diff --git a/packages/app/src/components/shortcuts-modal/config.ts b/packages/app/src/components/shortcuts-modal/config.ts
index 4114756a6d..b5cf587536 100644
--- a/packages/app/src/components/shortcuts-modal/config.ts
+++ b/packages/app/src/components/shortcuts-modal/config.ts
@@ -1,71 +1,85 @@
-export const macKeyboardShortcuts = {
-  Undo: '⌘+Z',
-  Redo: '⌘+⇧+Z',
-  Bold: '⌘+B',
-  Italic: '⌘+I',
-  Underline: '⌘+U',
-  Strikethrough: '⌘+⇧+S',
-  'Inline code': ' ⌘+E',
-  'Code block': '⌘+⌥+C',
-  Link: '⌘+K',
-  'Body text': '⌘+⌥+0',
-  'Heading 1': '⌘+⌥+1',
-  'Heading 2': '⌘+⌥+2',
-  'Heading 3': '⌘+⌥+3',
-  'Heading 4': '⌘+⌥+4',
-  'Heading 5': '⌘+⌥+5',
-  'Heading 6': '⌘+⌥+6',
-  'Increase indent': 'Tab',
-  'Reduce indent': '⇧+Tab',
+import { useTranslation } from 'react-i18next';
+export const useMacKeyboardShortcuts = () => {
+  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 = () => {
+  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 = () => {
+  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 = () => {
+  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 9a9133e88b..4f28b0ecec 100644
--- a/packages/app/src/components/shortcuts-modal/index.tsx
+++ b/packages/app/src/components/shortcuts-modal/index.tsx
@@ -8,10 +8,10 @@ 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';
@@ -27,13 +27,18 @@ const isMac = () => {
 };
 
 export const ShortcutsModal = ({ open, onClose }: ModalProps) => {
-  const markdownShortcuts = isMac()
-    ? macMarkdownShortcuts()
-    : winMarkdownShortcuts();
-  const keyboardShortcuts = isMac()
-    ? macKeyboardShortcuts()
-    : windowsKeyboardShortcuts();
   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(
     <Slide direction="left" in={open} mountOnEnter unmountOnExit>
       <StyledShortcutsModal data-testid="shortcuts-modal">

From 8b8665df6bb18bc8b99eb69f823d1453e86a4272 Mon Sep 17 00:00:00 2001
From: JimmFly <yangjinfei001@gmail.com>
Date: Thu, 5 Jan 2023 12:55:15 +0800
Subject: [PATCH 6/9] fix: message wrong about favourites (#669)

* fix: wrong message
* chore: update type
---
 packages/app/src/components/contact-modal/index.tsx   |  5 ++++-
 .../header/header-right-items/editor-option-menu.tsx  |  4 ++--
 packages/app/src/components/page-list/index.tsx       |  2 +-
 .../app/src/components/page-list/operation-cell.tsx   |  4 ++--
 packages/app/src/components/quick-search/config.ts    |  9 ++++++++-
 packages/app/src/components/shortcuts-modal/config.ts | 11 +++++++----
 packages/app/src/libs/i18n/resources/en.json          |  4 ++--
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/app/src/components/contact-modal/index.tsx b/packages/app/src/components/contact-modal/index.tsx
index 50c1e1b530..921b34ba65 100644
--- a/packages/app/src/components/contact-modal/index.tsx
+++ b/packages/app/src/components/contact-modal/index.tsx
@@ -57,7 +57,10 @@ type TransitionsModalProps = {
   onClose: () => void;
 };
 
-export const ContactModal = ({ open, onClose }: TransitionsModalProps) => {
+export const ContactModal = ({
+  open,
+  onClose,
+}: TransitionsModalProps): JSX.Element => {
   const { t } = useTranslation();
   const rightLinkList = [
     {
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 738e344d48..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
@@ -37,12 +37,12 @@ const PopoverContent = () => {
         onClick={() => {
           toggleFavoritePage(id);
           toast(
-            !favorite ? t('Removed to Favourites') : t('Added to Favourites')
+            favorite ? t('Removed from Favourites') : t('Added to Favourites')
           );
         }}
         icon={favorite ? <FavouritedIcon /> : <FavouritesIcon />}
       >
-        {favorite ? t('Remove to favourites') : t('Add to favourites')}
+        {favorite ? t('Remove from favourites') : t('Add to favourites')}
       </MenuItem>
       <MenuItem
         icon={mode === 'page' ? <EdgelessIcon /> : <PaperIcon />}
diff --git a/packages/app/src/components/page-list/index.tsx b/packages/app/src/components/page-list/index.tsx
index a4c7b8dbde..604d71000f 100644
--- a/packages/app/src/components/page-list/index.tsx
+++ b/packages/app/src/components/page-list/index.tsx
@@ -45,7 +45,7 @@ const FavoriteTag = ({
           e.stopPropagation();
           toggleFavoritePage(id);
           toast(
-            !favorite ? t('Removed to Favourites') : t('Added to Favourites')
+            favorite ? t('Removed from Favourites') : t('Added to Favourites')
           );
         }}
         style={{
diff --git a/packages/app/src/components/page-list/operation-cell.tsx b/packages/app/src/components/page-list/operation-cell.tsx
index 3052199c4d..1b4ec7434a 100644
--- a/packages/app/src/components/page-list/operation-cell.tsx
+++ b/packages/app/src/components/page-list/operation-cell.tsx
@@ -27,12 +27,12 @@ export const OperationCell = ({ pageMeta }: { pageMeta: PageMeta }) => {
         onClick={() => {
           toggleFavoritePage(id);
           toast(
-            !favorite ? t('Removed to Favourites') : t('Added to Favourites')
+            favorite ? t('Removed from Favourites') : t('Added to Favourites')
           );
         }}
         icon={favorite ? <FavouritedIcon /> : <FavouritesIcon />}
       >
-        {favorite ? t('Remove to favourites') : t('Add to favourites')}
+        {favorite ? t('Remove from favourites') : t('Add to favourites')}
       </MenuItem>
       <MenuItem
         onClick={() => {
diff --git a/packages/app/src/components/quick-search/config.ts b/packages/app/src/components/quick-search/config.ts
index c5171f06c7..c35636c3cc 100644
--- a/packages/app/src/components/quick-search/config.ts
+++ b/packages/app/src/components/quick-search/config.ts
@@ -1,6 +1,13 @@
 import { AllPagesIcon, FavouritesIcon, TrashIcon } from '@blocksuite/icons';
 import { useTranslation } from 'react-i18next';
-export const useSwitchToConfig = (currentWorkspaceId: string) => {
+
+export const useSwitchToConfig = (
+  currentWorkspaceId: string
+): {
+  title: string;
+  href: string;
+  icon: React.FC<React.SVGProps<SVGSVGElement>>;
+}[] => {
   const { t } = useTranslation();
   const List = [
     {
diff --git a/packages/app/src/components/shortcuts-modal/config.ts b/packages/app/src/components/shortcuts-modal/config.ts
index b5cf587536..7749209fe9 100644
--- a/packages/app/src/components/shortcuts-modal/config.ts
+++ b/packages/app/src/components/shortcuts-modal/config.ts
@@ -1,5 +1,8 @@
 import { useTranslation } from 'react-i18next';
-export const useMacKeyboardShortcuts = () => {
+interface ShortcutTip {
+  [x: string]: string;
+}
+export const useMacKeyboardShortcuts = (): ShortcutTip => {
   const { t } = useTranslation();
   return {
     [t('Undo')]: '⌘+Z',
@@ -23,7 +26,7 @@ export const useMacKeyboardShortcuts = () => {
   };
 };
 
-export const useMacMarkdownShortcuts = () => {
+export const useMacMarkdownShortcuts = (): ShortcutTip => {
   const { t } = useTranslation();
   return {
     [t('Bold')]: '**Text** ',
@@ -42,7 +45,7 @@ export const useMacMarkdownShortcuts = () => {
   };
 };
 
-export const useWindowsKeyboardShortcuts = () => {
+export const useWindowsKeyboardShortcuts = (): ShortcutTip => {
   const { t } = useTranslation();
   return {
     [t('Undo')]: 'Ctrl+Z',
@@ -65,7 +68,7 @@ export const useWindowsKeyboardShortcuts = () => {
     [t('Reduce indent')]: 'Shift+Tab',
   };
 };
-export const useWinMarkdownShortcuts = () => {
+export const useWinMarkdownShortcuts = (): ShortcutTip => {
   const { t } = useTranslation();
   return {
     [t('Bold')]: '**Text** ',
diff --git a/packages/app/src/libs/i18n/resources/en.json b/packages/app/src/libs/i18n/resources/en.json
index 45822ea009..9ce5282e71 100644
--- a/packages/app/src/libs/i18n/resources/en.json
+++ b/packages/app/src/libs/i18n/resources/en.json
@@ -11,8 +11,8 @@
   "Find results": "Find {{number}} results",
   "Collapse sidebar": "Collapse sidebar",
   "Expand sidebar": "Expand sidebar",
-  "Removed to Favourites": "Removed to Favourites",
-  "Remove to favourites": "Remove to favourites",
+  "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",

From 14507d0fc0d608611afd076bbb88f252933665b9 Mon Sep 17 00:00:00 2001
From: DarkSky <darksky2048@gmail.com>
Date: Thu, 5 Jan 2023 14:06:36 +0800
Subject: [PATCH 7/9] chore: remove problematic dependencies

---
 packages/app/package.json |  2 +-
 pnpm-lock.yaml            | 38 ++------------------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/packages/app/package.json b/packages/app/package.json
index 00b96a7fd1..ab9571a953 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -45,7 +45,7 @@
     "@types/react": "18.0.20",
     "@types/react-dom": "18.0.6",
     "@types/wicg-file-system-access": "^2020.9.5",
-    "chalk-next": "^6.1.5",
+    "chalk": "^4.1.2",
     "eslint": "8.22.0",
     "eslint-config-next": "12.3.1",
     "eslint-config-prettier": "^8.5.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0a5e883aae..cbf408c5db 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,7 +63,7 @@ importers:
       '@types/react': 18.0.20
       '@types/react-dom': 18.0.6
       '@types/wicg-file-system-access': ^2020.9.5
-      chalk-next: ^6.1.5
+      chalk: ^4.1.2
       cmdk: ^0.1.20
       css-spring: ^4.1.0
       dayjs: ^1.11.7
@@ -120,7 +120,7 @@ importers:
       '@types/react': 18.0.20
       '@types/react-dom': 18.0.6
       '@types/wicg-file-system-access': 2020.9.5
-      chalk-next: 6.1.5
+      chalk: 4.1.2
       eslint: 8.22.0
       eslint-config-next: 12.3.1_76twfck5d7crjqrmw4yltga7zm
       eslint-config-prettier: 8.5.0_eslint@8.22.0
@@ -4163,14 +4163,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /axios/0.21.4:
-    resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
-    dependencies:
-      follow-redirects: 1.15.2
-    transitivePeerDependencies:
-      - debug
-    dev: true
-
   /axobject-query/2.2.0:
     resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==}
     dev: true
@@ -4449,18 +4441,6 @@ packages:
   /caniuse-lite/1.0.30001419:
     resolution: {integrity: sha512-aFO1r+g6R7TW+PNQxKzjITwLOyDhVRLjW0LcwS/HCZGUUKTGNp9+IwLC4xyDSZBygVL/mxaFR3HIV6wEKQuSzw==}
 
-  /chalk-next/6.1.5:
-    resolution: {integrity: sha512-OAx9F3vSk18qpfCohk0849/j3GyaoIpv8eXjmpdbmLZt+5+sWYq8xwt3B5ue25irLcxFcLL2hAbxxHSsBxupbw==}
-    engines: {node: '>=10'}
-    dependencies:
-      ansi-styles: 4.3.0
-      axios: 0.21.4
-      fs: 0.0.1-security
-      supports-color: 7.2.0
-    transitivePeerDependencies:
-      - debug
-    dev: true
-
   /chalk/2.4.2:
     resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
     engines: {node: '>=4'}
@@ -5838,16 +5818,6 @@ packages:
     resolution: {integrity: sha512-W7cHV7Hrwjid6lWmy0IhsWDFQboWSng25U3VVywpHOTJnnAZNPScog67G+cVpeX9f7yDD21ih0WDrMMT+JoaYg==}
     dev: false
 
-  /follow-redirects/1.15.2:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: true
-
   /form-data-encoder/2.1.4:
     resolution: {integrity: sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==}
     engines: {node: '>= 14.17'}
@@ -5892,10 +5862,6 @@ packages:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
     dev: true
 
-  /fs/0.0.1-security:
-    resolution: {integrity: sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==}
-    dev: true
-
   /fsevents/2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}

From f7eb92fa9bd44bc2a7cbe02fd8b1af2db822b95c Mon Sep 17 00:00:00 2001
From: DarkSky <25152247+darkskygit@users.noreply.github.com>
Date: Thu, 5 Jan 2023 14:20:30 +0800
Subject: [PATCH 8/9] feat: all deps change need check

---
 .github/CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..f80d334591
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+**/project.json @darkskygit
+**/pnpm-lock.yaml @darkskygit

From 6ebd13cb28feed024f7ea31b0aa8ea121be5938d Mon Sep 17 00:00:00 2001
From: Zhizhen He <hezhizhen.yi@gmail.com>
Date: Thu, 5 Jan 2023 21:50:50 +0800
Subject: [PATCH 9/9] fix: typo

---
 packages/app/src/templates/Welcome-to-AFFiNE-Alpha-v2.0.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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..e0fc661340 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
@@ -27,7 +27,7 @@ Let us know what you think of this latest version.
 
 ### Playground:
 
-[] Try a horiztaonl line: `---`
+[] Try a horizontal line: `---`
 
 [] What about a code block? ```