From 93ef92e15bc3d113e0ed14b7b87a7164832531c7 Mon Sep 17 00:00:00 2001 From: x1a0t <405028157@qq.com> Date: Wed, 11 Jan 2023 16:01:27 +0800 Subject: [PATCH 01/10] chore: adding code block background color, line number color, fixing landing page case sensitivity --- packages/app/src/styles/theme.ts | 6 ++++++ packages/app/src/styles/types.ts | 5 +++++ packages/app/src/templates/Welcome-to-AFFiNE-Alpha-v2.0.md | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/app/src/styles/theme.ts b/packages/app/src/styles/theme.ts index 1412e00285..f317397fae 100644 --- a/packages/app/src/styles/theme.ts +++ b/packages/app/src/styles/theme.ts @@ -20,6 +20,7 @@ export const getLightTheme = ( popoverBackground: '#fff', tooltipBackground: '#6880FF', codeBackground: '#f2f5f9', + codeBlockBackground: '#fafbfd', warningBackground: '#FFF9C7', errorBackground: '#FFDED8', @@ -40,6 +41,7 @@ export const getLightTheme = ( disableColor: '#C0C0C0', warningColor: '#906616', errorColor: '#EB4335', + lineNumberColor: '#888A9E', }, font: { xs: '12px', @@ -96,6 +98,7 @@ export const getDarkTheme = ( editorMode === 'edgeless' ? lightTheme.colors.codeBackground : '#505662', + codeBlockBackground: '#36383D', warningBackground: '#FFF9C7', errorBackground: '#FFDED8', @@ -117,6 +120,7 @@ export const getDarkTheme = ( disableColor: '#4b4b4b', warningColor: '#906616', errorColor: '#EB4335', + lineNumberColor: '#888A9E', }, shadow: { popover: @@ -154,12 +158,14 @@ export const globalThemeVariables: ( '--affine-popover-color': theme.colors.popoverColor, '--affine-input-color': theme.colors.inputColor, '--affine-code-color': theme.colors.codeColor, + '--affine-code-block-background': theme.colors.codeBlockBackground, '--affine-quote-color': theme.colors.quoteColor, '--affine-selected-color': theme.colors.selectedColor, '--affine-placeholder-color': theme.colors.placeHolderColor, '--affine-border-color': theme.colors.borderColor, '--affine-disable-color': theme.colors.disableColor, '--affine-tooltip-color': theme.colors.tooltipColor, + '--affine-line-number-color': theme.colors.lineNumberColor, '--affine-modal-shadow': theme.shadow.modal, '--affine-popover-shadow': theme.shadow.popover, diff --git a/packages/app/src/styles/types.ts b/packages/app/src/styles/types.ts index 85b12df586..81816ad611 100644 --- a/packages/app/src/styles/types.ts +++ b/packages/app/src/styles/types.ts @@ -25,6 +25,7 @@ export interface AffineTheme { hoverBackground: string; innerHoverBackground: string; codeBackground: string; + codeBlockBackground: string; warningBackground: string; errorBackground: string; // Use for the page`s text @@ -47,6 +48,7 @@ export interface AffineTheme { disableColor: string; warningColor: string; errorColor: string; + lineNumberColor: string; }; font: { xs: string; // tiny @@ -90,6 +92,8 @@ export interface AffineThemeCSSVariables { '--affine-popover-background': AffineTheme['colors']['popoverBackground']; '--affine-hover-background': AffineTheme['colors']['hoverBackground']; '--affine-code-background': AffineTheme['colors']['codeBackground']; + + '--affine-code-block-background': AffineTheme['colors']['codeBlockBackground']; '--affine-tooltip-background': AffineTheme['colors']['tooltipBackground']; '--affine-text-color': AffineTheme['colors']['textColor']; @@ -107,6 +111,7 @@ export interface AffineThemeCSSVariables { '--affine-border-color': AffineTheme['colors']['borderColor']; '--affine-disable-color': AffineTheme['colors']['disableColor']; '--affine-tooltip-color': AffineTheme['colors']['tooltipColor']; + '--affine-line-number-color': AffineTheme['colors']['lineNumberColor']; '--affine-modal-shadow': AffineTheme['shadow']['modal']; '--affine-popover-shadow': AffineTheme['shadow']['popover']; 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 130b2918b8..91e2fe48c0 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 @@ -39,7 +39,7 @@ docker run -it --name affine -d -v [YOUR_PATH]:/app/data -p 3000:3000 ghcr.io/to [] What about a code block? ````` -```javascript +```JavaScript console.log('Hello world'); ``` From 4e25fa3054b39add45c849efb3b7ac69ca6efcd4 Mon Sep 17 00:00:00 2001 From: DarkSky Date: Wed, 11 Jan 2023 16:40:46 +0800 Subject: [PATCH 02/10] chore: disable outdated feature --- packages/app/src/components/header/Header.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/components/header/Header.tsx b/packages/app/src/components/header/Header.tsx index 9db8149d5e..51c462907d 100644 --- a/packages/app/src/components/header/Header.tsx +++ b/packages/app/src/components/header/Header.tsx @@ -40,7 +40,7 @@ const HeaderRightItems: Record = { editorOptionMenu: , trashButtonGroup: , themeModeSwitch: , - syncUser: , + syncUser: null, //, }; export const Header = ({ From 0be59eef607762bccb1692d182fab7d5298bdf6c Mon Sep 17 00:00:00 2001 From: JimmFly Date: Wed, 11 Jan 2023 17:25:16 +0800 Subject: [PATCH 03/10] test: skip searchArrowButton test case --- tests/quick-search.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/quick-search.spec.ts b/tests/quick-search.spec.ts index 9d4dbf2add..b1049acce9 100644 --- a/tests/quick-search.spec.ts +++ b/tests/quick-search.spec.ts @@ -32,7 +32,7 @@ test.describe('Open quick search', () => { await expect(quickSearch).toBeVisible(); }); - test('Click arrowDown icon after title', async ({ page }) => { + test.skip('Click arrowDown icon after title', async ({ page }) => { await newPage(page); const quickSearchButton = page.locator( '[data-testid=header-quickSearchButton]' From 18ecf52f622300e055c52a413edbe05885dfb24d Mon Sep 17 00:00:00 2001 From: JimmFly Date: Wed, 11 Jan 2023 17:26:06 +0800 Subject: [PATCH 04/10] chore: remove searchArrowButton --- packages/app/src/components/header/EditorHeader.tsx | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/app/src/components/header/EditorHeader.tsx b/packages/app/src/components/header/EditorHeader.tsx index b343179496..491174f578 100644 --- a/packages/app/src/components/header/EditorHeader.tsx +++ b/packages/app/src/components/header/EditorHeader.tsx @@ -1,14 +1,8 @@ import React, { useEffect, useState } from 'react'; -import { - StyledSearchArrowWrapper, - StyledSwitchWrapper, - StyledTitle, - StyledTitleWrapper, -} from './styles'; +import { StyledSwitchWrapper, StyledTitle, StyledTitleWrapper } from './styles'; import { Content } from '@/ui/layout'; import { useAppState } from '@/providers/app-state-provider/context'; import EditorModeSwitch from '@/components/editor-mode-switch'; -import QuickSearchButton from './QuickSearchButton'; import Header from './Header'; import usePropsUpdated from '@/hooks/use-props-updated'; import useCurrentPageMeta from '@/hooks/use-current-page-meta'; @@ -64,9 +58,9 @@ export const EditorHeader = () => { /> {title} - + {/* - + */} )} From 2c32d4614f3d6be4b2e776ee1c157f98e3e49083 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Wed, 11 Jan 2023 17:26:39 +0800 Subject: [PATCH 05/10] chore: update words --- packages/app/src/components/header/QuickSearchButton.tsx | 2 +- packages/app/src/components/quick-search/Results.tsx | 2 +- packages/i18n/src/resources/en.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app/src/components/header/QuickSearchButton.tsx b/packages/app/src/components/header/QuickSearchButton.tsx index 0b28e43b09..f5d2023500 100644 --- a/packages/app/src/components/header/QuickSearchButton.tsx +++ b/packages/app/src/components/header/QuickSearchButton.tsx @@ -11,7 +11,7 @@ export const QuickSearchButton = ({ const { triggerQuickSearchModal } = useModal(); const { t } = useTranslation(); return ( - + ) ) : ( - + {List.map(link => { return ( Date: Wed, 11 Jan 2023 17:39:14 +0800 Subject: [PATCH 06/10] chore: remove unused import --- packages/app/src/components/header/Header.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/src/components/header/Header.tsx b/packages/app/src/components/header/Header.tsx index 51c462907d..4b7a6fcf73 100644 --- a/packages/app/src/components/header/Header.tsx +++ b/packages/app/src/components/header/Header.tsx @@ -11,7 +11,6 @@ import { getWarningMessage, shouldShowWarning } from './utils'; import EditorOptionMenu from './header-right-items/EditorOptionMenu'; import TrashButtonGroup from './header-right-items/TrashButtonGroup'; import ThemeModeSwitch from './header-right-items/theme-mode-switch'; -import SyncUser from './header-right-items/SyncUser'; const BrowserWarning = ({ show, From a7e6d16930e2348610299cf667901d2db10b4d53 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Wed, 11 Jan 2023 17:43:14 +0800 Subject: [PATCH 07/10] chore: add date --- packages/app/src/components/contact-modal/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/app/src/components/contact-modal/index.tsx b/packages/app/src/components/contact-modal/index.tsx index 3cd4d04f85..6ec64fc144 100644 --- a/packages/app/src/components/contact-modal/index.tsx +++ b/packages/app/src/components/contact-modal/index.tsx @@ -76,6 +76,8 @@ export const ContactModal = ({ link: 'https://community.affine.pro', }, ]; + const date = new Date(); + const year = date.getFullYear(); return (

-

Copyright © 2022 Toeverything

+

Copyright © {year} Toeverything

 From fe189e383bf50f9d8d4fcf3737684d13d8b27de1 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Wed, 11 Jan 2023 17:44:21 +0800 Subject: [PATCH 08/10] chore: remove unused import --- packages/app/src/components/header/Header.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/src/components/header/Header.tsx b/packages/app/src/components/header/Header.tsx index 51c462907d..4b7a6fcf73 100644 --- a/packages/app/src/components/header/Header.tsx +++ b/packages/app/src/components/header/Header.tsx @@ -11,7 +11,6 @@ import { getWarningMessage, shouldShowWarning } from './utils'; import EditorOptionMenu from './header-right-items/EditorOptionMenu'; import TrashButtonGroup from './header-right-items/TrashButtonGroup'; import ThemeModeSwitch from './header-right-items/theme-mode-switch'; -import SyncUser from './header-right-items/SyncUser'; const BrowserWarning = ({ show, From 3357c3d43b1d487bc6983f2fde78332c8406ade1 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Wed, 11 Jan 2023 18:03:29 +0800 Subject: [PATCH 09/10] test: skip cloud sync --- tests/libs/page-logic.ts | 13 ++++++++----- tests/login.spec.ts | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/libs/page-logic.ts b/tests/libs/page-logic.ts index 09385a4cb0..4ee958d7e7 100644 --- a/tests/libs/page-logic.ts +++ b/tests/libs/page-logic.ts @@ -5,9 +5,12 @@ export async function newPage(page: Page) { } export async function clickPageMoreActions(page: Page) { - return page - .getByTestId('editor-header-items') - .getByRole('button') - .nth(2) - .click(); + return ( + page + .getByTestId('editor-header-items') + .getByRole('button') + //FIXME: temporary change due to cloud sync icon being hidden + .nth(1) + .click() + ); } diff --git a/tests/login.spec.ts b/tests/login.spec.ts index ed7185259f..f5feb9d9c5 100644 --- a/tests/login.spec.ts +++ b/tests/login.spec.ts @@ -15,7 +15,7 @@ test.describe('Login Flow', () => { .click(); }); - test('Open login modal by click cloud-unsync-icon', async ({ page }) => { + test.skip('Open login modal by click cloud-unsync-icon', async ({ page }) => { await page.getByTestId('cloud-unsync-icon').click(); await page.waitForTimeout(800); From 5749b5f71197df7ddd030b527c141c1c4b7da8fe Mon Sep 17 00:00:00 2001 From: JimmFly Date: Wed, 11 Jan 2023 18:26:58 +0800 Subject: [PATCH 10/10] test: skip cloud sync --- tests/libs/page-logic.ts | 13 ++++++++----- tests/login.spec.ts | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/libs/page-logic.ts b/tests/libs/page-logic.ts index 09385a4cb0..bb6c71d2ba 100644 --- a/tests/libs/page-logic.ts +++ b/tests/libs/page-logic.ts @@ -5,9 +5,12 @@ export async function newPage(page: Page) { } export async function clickPageMoreActions(page: Page) { - return page - .getByTestId('editor-header-items') - .getByRole('button') - .nth(2) - .click(); + return ( + page + .getByTestId('editor-header-items') + .getByRole('button') + //FIXME: temporary change due to cloud sync icon being hidden + .nth(0) + .click() + ); } diff --git a/tests/login.spec.ts b/tests/login.spec.ts index ed7185259f..f5feb9d9c5 100644 --- a/tests/login.spec.ts +++ b/tests/login.spec.ts @@ -15,7 +15,7 @@ test.describe('Login Flow', () => { .click(); }); - test('Open login modal by click cloud-unsync-icon', async ({ page }) => { + test.skip('Open login modal by click cloud-unsync-icon', async ({ page }) => { await page.getByTestId('cloud-unsync-icon').click(); await page.waitForTimeout(800);