From bc29986f284e3b541734ffa55a03c8ede1681f63 Mon Sep 17 00:00:00 2001 From: tzhangchi Date: Tue, 20 Dec 2022 20:56:11 +0800 Subject: [PATCH 1/5] feat: add .env.local.template --- packages/app/.env.local.template | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/app/.env.local.template diff --git a/packages/app/.env.local.template b/packages/app/.env.local.template new file mode 100644 index 0000000000..479003b72d --- /dev/null +++ b/packages/app/.env.local.template @@ -0,0 +1,7 @@ +NEXT_PUBLIC_FIREBASE_API_KEY= +NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN= +NEXT_PUBLIC_FIREBASE_PROJECT_ID= +NEXT_PUBLIC_FIREBASE_STORAGE_BUCKET= +NEXT_PUBLIC_FIREBASE_MESSAGING_SENDER_ID= +NEXT_PUBLIC_FIREBASE_APP_ID= +NEXT_PUBLIC_FIREBASE_MEASUREMENT_ID= From 29292b2f41c03450d217e34aadf63f6125d6cb98 Mon Sep 17 00:00:00 2001 From: tzhangchi Date: Tue, 20 Dec 2022 21:03:15 +0800 Subject: [PATCH 2/5] fix: remove unused text --- .../app/src/components/workspace-setting/workspace-setting.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/app/src/components/workspace-setting/workspace-setting.tsx b/packages/app/src/components/workspace-setting/workspace-setting.tsx index fcf3962c2d..10faa73cc2 100644 --- a/packages/app/src/components/workspace-setting/workspace-setting.tsx +++ b/packages/app/src/components/workspace-setting/workspace-setting.tsx @@ -208,7 +208,6 @@ const MembersPage = () => { open={isInviteModalShow} > - Inv ); }; From 7b945f0cef1d6842ed87b11c57a221e98a10646c Mon Sep 17 00:00:00 2001 From: alt0 Date: Wed, 21 Dec 2022 10:09:42 +0800 Subject: [PATCH 3/5] fix: build error --- packages/app/src/components/header/header.tsx | 2 +- packages/app/src/providers/editor-provider/index.ts | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 packages/app/src/providers/editor-provider/index.ts diff --git a/packages/app/src/components/header/header.tsx b/packages/app/src/components/header/header.tsx index bdf6503c3e..d846cb841a 100644 --- a/packages/app/src/components/header/header.tsx +++ b/packages/app/src/components/header/header.tsx @@ -55,7 +55,7 @@ const PopoverContent = () => { : } onClick={() => { - changePageMode(id); + changePageMode(id, mode === 'page' ? 'edgeless' : 'page'); }} > Convert to {mode === 'page' ? 'Edgeless' : 'Page'} diff --git a/packages/app/src/providers/editor-provider/index.ts b/packages/app/src/providers/editor-provider/index.ts deleted file mode 100644 index d0826b40a6..0000000000 --- a/packages/app/src/providers/editor-provider/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -// export * from './editor-provider'; -// export * from './example-markdown'; -// export * from './utils'; -// export * from './interface'; From c178c017cc5499195e6f389a63d7dbc3ad8f6ba7 Mon Sep 17 00:00:00 2001 From: QiShaoXuan Date: Wed, 21 Dec 2022 10:54:48 +0800 Subject: [PATCH 4/5] feat: modify contact modal text --- packages/app/src/components/contact-modal/index.tsx | 11 ++++------- packages/app/src/components/contact-modal/style.ts | 7 ++++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/app/src/components/contact-modal/index.tsx b/packages/app/src/components/contact-modal/index.tsx index cae11c7e79..96110f2a2a 100644 --- a/packages/app/src/components/contact-modal/index.tsx +++ b/packages/app/src/components/contact-modal/index.tsx @@ -60,9 +60,9 @@ const rightLinkList = [ }, { icon: , - title: 'Check Our Docs', - subTitle: 'docs.AFFiNE.pro', - link: 'https://docs.affine.pro', + title: 'AFFiNE Community', + subTitle: 'community.affine.pro', + link: 'https://community.affine.pro', }, ]; @@ -109,10 +109,7 @@ export const ContactModal = ({ open, onClose }: TransitionsModalProps) => { })} - - Get in touch!
- Join our community. - + Get in touch! {linkList.map(({ icon, title, link }) => { return ( diff --git a/packages/app/src/components/contact-modal/style.ts b/packages/app/src/components/contact-modal/style.ts index e0954a194d..f1188359f2 100644 --- a/packages/app/src/components/contact-modal/style.ts +++ b/packages/app/src/components/contact-modal/style.ts @@ -2,10 +2,10 @@ import { absoluteCenter, displayFlex, styled } from '@/styles'; export const StyledBigLink = styled('a')(({ theme }) => { return { - width: '320px', + width: '334px', height: '100px', marginBottom: '48px', - paddingLeft: '114px', + paddingLeft: '90px', fontSize: '24px', lineHeight: '36px', fontWeight: '600', @@ -29,7 +29,7 @@ export const StyledBigLink = styled('a')(({ theme }) => { height: '50px', marginRight: '40px', color: theme.colors.primaryColor, - ...absoluteCenter({ vertical: true, position: { left: '32px' } }), + ...absoluteCenter({ vertical: true, position: { left: '20px' } }), }, p: { width: '100%', @@ -85,6 +85,7 @@ export const StyledSmallLink = styled('a')(({ theme }) => { }); export const StyledSubTitle = styled('div')(({ theme }) => { return { + width: '190px', fontSize: '18px', fontWeight: '600', color: theme.colors.textColor, From 0e36e141c19939d673b796b8982e6bec961fecf5 Mon Sep 17 00:00:00 2001 From: JimmFly Date: Wed, 21 Dec 2022 10:54:51 +0800 Subject: [PATCH 5/5] feat: add empty svg component --- packages/app/src/ui/empty/empty.tsx | 20 ++++++ packages/app/src/ui/empty/emptyPage.svg | 20 ++++++ packages/app/src/ui/empty/emptySVG.tsx | 87 +++++++++++++++++++++++++ packages/app/src/ui/empty/index.ts | 1 + 4 files changed, 128 insertions(+) create mode 100644 packages/app/src/ui/empty/empty.tsx create mode 100644 packages/app/src/ui/empty/emptyPage.svg create mode 100644 packages/app/src/ui/empty/emptySVG.tsx create mode 100644 packages/app/src/ui/empty/index.ts diff --git a/packages/app/src/ui/empty/empty.tsx b/packages/app/src/ui/empty/empty.tsx new file mode 100644 index 0000000000..ec6cc1607b --- /dev/null +++ b/packages/app/src/ui/empty/empty.tsx @@ -0,0 +1,20 @@ +import React, { CSSProperties } from 'react'; +import { EmptySVG } from './emptySVG'; +import { styled } from '@/styles'; + +export type ContentProps = { + width?: CSSProperties['width']; + height?: CSSProperties['height']; + fontSize?: CSSProperties['fontSize']; +}; +export const Empty = styled(EmptySVG)( + ({ theme, fontSize, width, height }) => { + return { + width, + height, + fontSize, + }; + } +); + +export default Empty; diff --git a/packages/app/src/ui/empty/emptyPage.svg b/packages/app/src/ui/empty/emptyPage.svg new file mode 100644 index 0000000000..e5a4f4b32f --- /dev/null +++ b/packages/app/src/ui/empty/emptyPage.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/packages/app/src/ui/empty/emptySVG.tsx b/packages/app/src/ui/empty/emptySVG.tsx new file mode 100644 index 0000000000..3db455a137 --- /dev/null +++ b/packages/app/src/ui/empty/emptySVG.tsx @@ -0,0 +1,87 @@ +import SvgIcon, { SvgIconProps } from '@mui/material/SvgIcon'; + +export const EmptySVG = (props: SvgIconProps) => { + return ( + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/packages/app/src/ui/empty/index.ts b/packages/app/src/ui/empty/index.ts new file mode 100644 index 0000000000..b0a7bdc7cc --- /dev/null +++ b/packages/app/src/ui/empty/index.ts @@ -0,0 +1 @@ +export * from './empty';