From 0984c37cad4d3b19c532f6336e10a0c6ab92c7fe Mon Sep 17 00:00:00 2001 From: Peng Xiao Date: Thu, 9 Feb 2023 11:30:57 +0800 Subject: [PATCH] fix: add page titles (#883) --- packages/app/src/components/editor/index.tsx | 1 - packages/app/src/pages/404.tsx | 10 +++++++++- packages/app/src/pages/_app.tsx | 1 + .../app/src/pages/workspace/[workspaceId]/[pageId].tsx | 6 ++++++ packages/app/src/pages/workspace/[workspaceId]/all.tsx | 5 +++++ .../app/src/pages/workspace/[workspaceId]/favorite.tsx | 4 ++++ .../app/src/pages/workspace/[workspaceId]/setting.tsx | 4 ++++ .../app/src/pages/workspace/[workspaceId]/trash.tsx | 4 ++++ 8 files changed, 33 insertions(+), 2 deletions(-) diff --git a/packages/app/src/components/editor/index.tsx b/packages/app/src/components/editor/index.tsx index eff0dc21aa..6e22f03080 100644 --- a/packages/app/src/components/editor/index.tsx +++ b/packages/app/src/components/editor/index.tsx @@ -59,7 +59,6 @@ export const Editor = ({ page, workspace, setEditor }: Props) => { } setEditor(editor); - document.title = page.meta.title || 'Untitled'; return ret; }, [workspace, page, setEditor]); diff --git a/packages/app/src/pages/404.tsx b/packages/app/src/pages/404.tsx index 0eef5261e5..6baddddeaa 100644 --- a/packages/app/src/pages/404.tsx +++ b/packages/app/src/pages/404.tsx @@ -1,5 +1,13 @@ import NotfoundPage from '@/components/404'; +import Head from 'next/head'; export default function Custom404() { - return ; + return ( + <> + + 404 - AFFiNE + + + + ); } diff --git a/packages/app/src/pages/_app.tsx b/packages/app/src/pages/_app.tsx index 5f1c9499d3..ca96b8ef68 100644 --- a/packages/app/src/pages/_app.tsx +++ b/packages/app/src/pages/_app.tsx @@ -50,6 +50,7 @@ const App = ({ Component, pageProps }: AppPropsWithLayout) => { sizes="180x180" href="/icons/apple-touch-icon.png" /> + AFFiNE import('@/components/editor'), { ssr: false, }); @@ -25,8 +27,12 @@ const Page: NextPageWithLayout = () => { (editor: EditorContainer) => setEditor.current(editor), [setEditor] ); + const { t } = useTranslation(); return ( <> + + {currentPage?.meta?.title || t('Untitled')} - AFFiNE + diff --git a/packages/app/src/pages/workspace/[workspaceId]/all.tsx b/packages/app/src/pages/workspace/[workspaceId]/all.tsx index 5d8eb5b431..72ad34c485 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/all.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/all.tsx @@ -5,6 +5,8 @@ import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; import { useTranslation } from '@affine/i18n'; import { PageMeta, useAppState } from '@/providers/app-state-provider'; +import Head from 'next/head'; + const All = () => { const { currentWorkspace } = useAppState(); const pageList = (currentWorkspace?.blocksuiteWorkspace?.meta.pageMetas || @@ -12,6 +14,9 @@ const All = () => { const { t } = useTranslation(); return ( <> + + {t('All pages')} - AFFiNE + }>{t('All pages')} !p.trash)} diff --git a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx b/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx index cc3f0369a3..9c088d9d45 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx @@ -5,11 +5,15 @@ import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; import { useTranslation } from '@affine/i18n'; import { useAppState } from '@/providers/app-state-provider'; +import Head from 'next/head'; export const Favorite = () => { const { pageList } = useAppState(); const { t } = useTranslation(); return ( <> + + {t('Favourites')} - AFFiNE + }> {t('Favourites')} diff --git a/packages/app/src/pages/workspace/[workspaceId]/setting.tsx b/packages/app/src/pages/workspace/[workspaceId]/setting.tsx index 8754e52a7e..d2c70c3dd0 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/setting.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/setting.tsx @@ -19,6 +19,7 @@ import WorkspaceLayout from '@/components/workspace-layout'; import { WorkspaceUnit } from '@affine/datacenter'; import { useTranslation } from '@affine/i18n'; import { PageListHeader } from '@/components/header'; +import Head from 'next/head'; const useTabMap = () => { const { t } = useTranslation(); @@ -79,6 +80,9 @@ const WorkspaceSetting = () => { useTabMap(); return ( <> + + {t('Settings')} - AFFiNE + }>{t('Settings')} diff --git a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx b/packages/app/src/pages/workspace/[workspaceId]/trash.tsx index d0c2350373..10c786c4fc 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/trash.tsx @@ -5,11 +5,15 @@ import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; import { useTranslation } from '@affine/i18n'; import { useAppState } from '@/providers/app-state-provider'; +import Head from 'next/head'; export const Trash = () => { const { pageList } = useAppState(); const { t } = useTranslation(); return ( <> + + {t('Trash')} - AFFiNE + }>{t('Trash')} p.trash)}