Merge remote-tracking branch 'origin/feat/cloud-sync' into feat/client-app

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",

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 = [
     {

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 />}

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={{

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={() => {

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 = [
     {

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** ',

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",

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? ```