From f78ee0670e788afaac76ecbe3e6cac637c38ced9 Mon Sep 17 00:00:00 2001 From: x1a0t <405028157@qq.com> Date: Thu, 12 Jan 2023 18:05:00 +0800 Subject: [PATCH 01/13] fix: remove redundant package in data-center --- package.json | 2 +- packages/data-center/package.json | 1 - pnpm-lock.yaml | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 43d76b7e12..24a82b0310 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "postinstall": "husky install", "notify": "node --experimental-modules scripts/notify.mjs", "check:ci": "pnpm lint & pnpm test", - "update:blocksuite": "pnpm i --filter @affine/app --filter @affine/datacenter @blocksuite/blocks@nightly @blocksuite/store@nightly @blocksuite/editor@nightly" + "update:blocksuite": "pnpm i --filter @affine/app --filter @affine/datacenter @blocksuite/blocks@nightly @blocksuite/store@nightly && pnpm i --filter @affine/app @blocksuite/editor@nightly" }, "lint-staged": { "*": "prettier --write --ignore-unknown", diff --git a/packages/data-center/package.json b/packages/data-center/package.json index f97871413a..45f13844d5 100644 --- a/packages/data-center/package.json +++ b/packages/data-center/package.json @@ -27,7 +27,6 @@ }, "dependencies": { "@blocksuite/blocks": "0.4.0-20230111171650-bc63456", - "@blocksuite/editor": "0.4.0-20230111171650-bc63456", "@blocksuite/store": "0.4.0-20230111171650-bc63456", "debug": "^4.3.4", "encoding": "^0.1.13", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7f96d5abe..90df4d2e27 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -124,7 +124,6 @@ importers: packages/data-center: specifiers: '@blocksuite/blocks': 0.4.0-20230111171650-bc63456 - '@blocksuite/editor': 0.4.0-20230111171650-bc63456 '@blocksuite/store': 0.4.0-20230111171650-bc63456 '@playwright/test': ^1.29.1 '@types/debug': ^4.1.7 @@ -142,7 +141,6 @@ importers: yjs: ^13.5.44 dependencies: '@blocksuite/blocks': 0.4.0-20230111171650-bc63456_yjs@13.5.44 - '@blocksuite/editor': 0.4.0-20230111171650-bc63456_yjs@13.5.44 '@blocksuite/store': 0.4.0-20230111171650-bc63456_yjs@13.5.44 debug: 4.3.4 encoding: 0.1.13 From 693a59c44640e80d4e926a809ce6717046474e2a Mon Sep 17 00:00:00 2001 From: tzhangchi Date: Fri, 13 Jan 2023 14:31:05 +0800 Subject: [PATCH 02/13] docs: add contributors --- .all-contributorsrc | 27 +++++++++++++++++++++++++++ README.md | 5 ++++- docs/contributor-add.md | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index b08412fb49..74bef4b2b9 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -436,6 +436,33 @@ "contributions": [ "code" ] + }, + { + "login": "hezhizhen", + "name": "Zhizhen He", + "avatar_url": "https://avatars.githubusercontent.com/u/7611700?v=4", + "profile": "https://t.me/littlepoint", + "contributions": [ + "code" + ] + }, + { + "login": "AkaraChen", + "name": "AkaraChen", + "avatar_url": "https://avatars.githubusercontent.com/u/85140972?v=4", + "profile": "https://akr.moe/", + "contributions": [ + "code" + ] + }, + { + "login": "suyanhanx", + "name": "Suyan", + "avatar_url": "https://avatars.githubusercontent.com/u/24221472?v=4", + "profile": "https://github.com/suyanhanx", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index 97c5d04bc4..a7cefa368d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ See https://github.com/all-?/all-contributors/issues/361#issuecomment-637166066 --> -[all-contributors-badge]: https://img.shields.io/badge/all_contributors-45-orange.svg?style=flat-square +[all-contributors-badge]: https://img.shields.io/badge/all_contributors-48-orange.svg?style=flat-square @@ -184,6 +184,9 @@ Thanks a lot to the community for providing such powerful and simple libraries,
Mohammed Faraz
📖
Pranav Sriram
💻
Reson-a
💻 +
Zhizhen He
💻 +
AkaraChen
💻 +
Suyan
💻 diff --git a/docs/contributor-add.md b/docs/contributor-add.md index 5cc07bd3ce..67768e8095 100644 --- a/docs/contributor-add.md +++ b/docs/contributor-add.md @@ -4,6 +4,7 @@ - https://allcontributors.org/docs/en/emoji-key ```shell +all-contributors check all-contributors add tzhangchi code,doc all-contributors generate ``` From fabd76edbe38eb26302ec051d62d4b632d226145 Mon Sep 17 00:00:00 2001 From: x1a0t <405028157@qq.com> Date: Fri, 13 Jan 2023 15:59:17 +0800 Subject: [PATCH 03/13] chore: update blocksuite including providing fetching header --- packages/app/package.json | 6 ++-- packages/data-center/package.json | 4 +-- pnpm-lock.yaml | 52 +++++++++++++++---------------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 31fa964621..ad13d1da75 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -11,10 +11,10 @@ "dependencies": { "@affine/datacenter": "workspace:*", "@affine/i18n": "workspace:*", - "@blocksuite/blocks": "0.4.0-20230111171650-bc63456", - "@blocksuite/editor": "0.4.0-20230111171650-bc63456", + "@blocksuite/blocks": "0.4.0-20230113023110-28a7fdc", + "@blocksuite/editor": "0.4.0-20230113023110-28a7fdc", "@blocksuite/icons": "^2.0.2", - "@blocksuite/store": "0.4.0-20230111171650-bc63456", + "@blocksuite/store": "0.4.0-20230113023110-28a7fdc", "@emotion/css": "^11.10.0", "@emotion/react": "^11.10.4", "@emotion/server": "^11.10.0", diff --git a/packages/data-center/package.json b/packages/data-center/package.json index 45f13844d5..5b24368eea 100644 --- a/packages/data-center/package.json +++ b/packages/data-center/package.json @@ -26,8 +26,8 @@ "typescript": "^4.8.4" }, "dependencies": { - "@blocksuite/blocks": "0.4.0-20230111171650-bc63456", - "@blocksuite/store": "0.4.0-20230111171650-bc63456", + "@blocksuite/blocks": "0.4.0-20230113023110-28a7fdc", + "@blocksuite/store": "0.4.0-20230113023110-28a7fdc", "debug": "^4.3.4", "encoding": "^0.1.13", "firebase": "^9.15.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 90df4d2e27..3ea0e08d63 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,10 +40,10 @@ importers: specifiers: '@affine/datacenter': workspace:* '@affine/i18n': workspace:* - '@blocksuite/blocks': 0.4.0-20230111171650-bc63456 - '@blocksuite/editor': 0.4.0-20230111171650-bc63456 + '@blocksuite/blocks': 0.4.0-20230113023110-28a7fdc + '@blocksuite/editor': 0.4.0-20230113023110-28a7fdc '@blocksuite/icons': ^2.0.2 - '@blocksuite/store': 0.4.0-20230111171650-bc63456 + '@blocksuite/store': 0.4.0-20230113023110-28a7fdc '@emotion/css': ^11.10.0 '@emotion/react': ^11.10.4 '@emotion/server': ^11.10.0 @@ -81,10 +81,10 @@ importers: dependencies: '@affine/datacenter': link:../data-center '@affine/i18n': link:../i18n - '@blocksuite/blocks': 0.4.0-20230111171650-bc63456_yjs@13.5.44 - '@blocksuite/editor': 0.4.0-20230111171650-bc63456_yjs@13.5.44 + '@blocksuite/blocks': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 + '@blocksuite/editor': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 '@blocksuite/icons': 2.0.4_w5j4k42lgipnm43s3brx6h3c34 - '@blocksuite/store': 0.4.0-20230111171650-bc63456_yjs@13.5.44 + '@blocksuite/store': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 '@emotion/css': 11.10.0 '@emotion/react': 11.10.4_w5j4k42lgipnm43s3brx6h3c34 '@emotion/server': 11.10.0_@emotion+css@11.10.0 @@ -123,8 +123,8 @@ importers: packages/data-center: specifiers: - '@blocksuite/blocks': 0.4.0-20230111171650-bc63456 - '@blocksuite/store': 0.4.0-20230111171650-bc63456 + '@blocksuite/blocks': 0.4.0-20230113023110-28a7fdc + '@blocksuite/store': 0.4.0-20230113023110-28a7fdc '@playwright/test': ^1.29.1 '@types/debug': ^4.1.7 debug: ^4.3.4 @@ -140,8 +140,8 @@ importers: y-protocols: ^1.0.5 yjs: ^13.5.44 dependencies: - '@blocksuite/blocks': 0.4.0-20230111171650-bc63456_yjs@13.5.44 - '@blocksuite/store': 0.4.0-20230111171650-bc63456_yjs@13.5.44 + '@blocksuite/blocks': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 + '@blocksuite/store': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 debug: 4.3.4 encoding: 0.1.13 firebase: 9.15.0_encoding@0.1.13 @@ -1455,12 +1455,12 @@ packages: to-fast-properties: 2.0.0 dev: true - /@blocksuite/blocks/0.4.0-20230111171650-bc63456_yjs@13.5.44: - resolution: {integrity: sha512-7fpb++pT9laoyLFWl4h09v7TUqZ/9udMrC1qxdX2XFgMPJjg3MJ9RG+Ud2s/zqZ1SkU1+0hMBvJP5ci9vV44gw==} + /@blocksuite/blocks/0.4.0-20230113023110-28a7fdc_yjs@13.5.44: + resolution: {integrity: sha512-o9J3Sl/GARVjoJJL3wIFPwMWdU+4jhRS8hmN2bRFu6l9BNybpNkJQnGFK1rC5RRYOTAXSCYP+xi3X0qcO1pjHA==} dependencies: - '@blocksuite/global': 0.4.0-20230111171650-bc63456 - '@blocksuite/phasor': 0.4.0-20230111171650-bc63456_yjs@13.5.44 - '@blocksuite/store': 0.4.0-20230111171650-bc63456_yjs@13.5.44 + '@blocksuite/global': 0.4.0-20230113023110-28a7fdc + '@blocksuite/phasor': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 + '@blocksuite/store': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 '@tldraw/intersect': 1.8.0 autosize: 5.0.2 highlight.js: 11.7.0 @@ -1476,11 +1476,11 @@ packages: - yjs dev: false - /@blocksuite/editor/0.4.0-20230111171650-bc63456_yjs@13.5.44: - resolution: {integrity: sha512-NbghDNWDGHXXfEqgnNhbw7zewGRyx9LUzOv1FmY2WVhzDu02MSrTWxMduChH1/tfLHRLe6jusmZKS9BNSUPynA==} + /@blocksuite/editor/0.4.0-20230113023110-28a7fdc_yjs@13.5.44: + resolution: {integrity: sha512-H0RkldzjVu8RlYb8gIZGKTFIYaY/M220sg+KEL0it7yjwiOWwrr/z0CeG6WvnBdBMnC/gkp4cdNQRFH3Sqkowg==} dependencies: - '@blocksuite/blocks': 0.4.0-20230111171650-bc63456_yjs@13.5.44 - '@blocksuite/store': 0.4.0-20230111171650-bc63456_yjs@13.5.44 + '@blocksuite/blocks': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 + '@blocksuite/store': 0.4.0-20230113023110-28a7fdc_yjs@13.5.44 lit: 2.6.0 marked: 4.2.5 turndown: 7.1.1 @@ -1491,8 +1491,8 @@ packages: - yjs dev: false - /@blocksuite/global/0.4.0-20230111171650-bc63456: - resolution: {integrity: sha512-/Kqg73vPLzxiWp6UqRmRoKfYmH4Sij3mU52RJf9adyywZOdM5e9E1gvPP+Eruz/x2jJ1uzR5/ivFqp5t688/tg==} + /@blocksuite/global/0.4.0-20230113023110-28a7fdc: + resolution: {integrity: sha512-urzR//wUMzZMB1NPLMUCguowYrfS/XK5FV8927IE+oK86GL3O2sWTnhrf/EgPGPn8CyBOBYbQPVUBNqkMl5q7A==} dev: false /@blocksuite/icons/2.0.4_w5j4k42lgipnm43s3brx6h3c34: @@ -1505,20 +1505,20 @@ packages: react: 18.2.0 dev: false - /@blocksuite/phasor/0.4.0-20230111171650-bc63456_yjs@13.5.44: - resolution: {integrity: sha512-fzmrG8KVJXkm5YyvHpPG1RRFhXjzuOey8OIoDu+/z87n9HJc4SkOd9JKH6wEL37F7P5ZoEM9Yl9YHxQjUc4/CA==} + /@blocksuite/phasor/0.4.0-20230113023110-28a7fdc_yjs@13.5.44: + resolution: {integrity: sha512-HnV2kUd9DX7seaaH/Xtv4oZQfipNWAh1uBLPtl2J17nNJ2gGzZpySXJXFIb4J4Wr5FXGSgnr0RiB8Jd+PyTOow==} peerDependencies: yjs: ^13 dependencies: yjs: 13.5.44 dev: false - /@blocksuite/store/0.4.0-20230111171650-bc63456_yjs@13.5.44: - resolution: {integrity: sha512-f/PKFPadA0KZq/wSLxxlS29c4SDuMfzHN1/gdrxFEIY0gC8caK2jZnT4K62R9Nquik/mXL60h8fBVAkQ0KbHzg==} + /@blocksuite/store/0.4.0-20230113023110-28a7fdc_yjs@13.5.44: + resolution: {integrity: sha512-+xwQUQbrRiyePf+VDsryhQa5ykO9nukHaCQTPmU1zQVBhlvEO2sfhy5f9VGQLts3hXW+8EqvNbr1RrASDh/x3g==} peerDependencies: yjs: ^13 dependencies: - '@blocksuite/global': 0.4.0-20230111171650-bc63456 + '@blocksuite/global': 0.4.0-20230113023110-28a7fdc '@types/flexsearch': 0.7.3 '@types/quill': 1.3.10 buffer: 6.0.3 From 746a6d9ab56893bab9ddf027c681b5d215c15b9b Mon Sep 17 00:00:00 2001 From: himself65 Date: Mon, 23 Jan 2023 13:52:40 -0600 Subject: [PATCH 04/13] fix: listen on title change --- .../workspace/[workspaceId]/[pageId].tsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx index 05c2c17eba..77cbdb5a18 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx @@ -16,6 +16,7 @@ import type { NextPageWithLayout } from '../..//_app'; import WorkspaceLayout from '@/components/workspace-layout'; import { useRouter } from 'next/router'; import { usePageHelper } from '@/hooks/use-page-helper'; +import { Disposable } from '@blocksuite/store/dist/utils/disposable'; const StyledEditorContainer = styled('div')(() => { return { @@ -24,6 +25,8 @@ const StyledEditorContainer = styled('div')(() => { }; }); +const firstPageTitle = 'Welcome to AFFiNE Alpha "Abbey Wood"' as const; + const Page: NextPageWithLayout = () => { const editorContainer = useRef(null); const { createEditor, setEditor, currentPage, currentWorkspace } = @@ -36,6 +39,7 @@ const Page: NextPageWithLayout = () => { node.removeChild(node.firstChild); } }; + let disposable: Disposable | undefined; const editor = createEditor?.current?.(currentPage!); if (editor) { @@ -45,11 +49,7 @@ const Page: NextPageWithLayout = () => { const isFirstPage = currentWorkspace?.meta.pageMetas.length === 1; // Can not use useCurrentPageMeta to get new title, cause meta title will trigger rerender, but the second time can not remove title const { title: metaTitle } = currentPage!.meta; - const title = metaTitle - ? metaTitle - : isFirstPage - ? 'Welcome to AFFiNE Alpha "Abbey Wood"' - : ''; + const title = metaTitle ? metaTitle : isFirstPage ? firstPageTitle : ''; currentWorkspace?.setPageMeta(currentPage!.id, { title }); const pageId = currentPage!.addBlock({ @@ -72,11 +72,17 @@ const Page: NextPageWithLayout = () => { }); } currentPage!.resetHistory(); + disposable = editor.pageBlockModel?.propsUpdated.on(() => { + document.title = isFirstPage + ? firstPageTitle + : currentPage?.meta.title || 'Untitled'; + }); } } - - document.title = currentPage?.meta.title || 'Untitled'; - return ret; + return () => { + ret(); + disposable?.dispose(); + }; }, [currentWorkspace, currentPage, createEditor, setEditor]); return ( From 3325a1bfe206bef6e2cf4aa5540305753a12dc44 Mon Sep 17 00:00:00 2001 From: himself65 Date: Mon, 23 Jan 2023 13:53:22 -0600 Subject: [PATCH 05/13] fix: import --- packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx index 77cbdb5a18..54a1b0c7f8 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx @@ -16,7 +16,7 @@ import type { NextPageWithLayout } from '../..//_app'; import WorkspaceLayout from '@/components/workspace-layout'; import { useRouter } from 'next/router'; import { usePageHelper } from '@/hooks/use-page-helper'; -import { Disposable } from '@blocksuite/store/dist/utils/disposable'; +import type { Disposable } from '@blocksuite/store'; const StyledEditorContainer = styled('div')(() => { return { From 60f8366f00493ea0f357fed368dc04ecb5b4b5e4 Mon Sep 17 00:00:00 2001 From: himself65 Date: Mon, 23 Jan 2023 13:56:22 -0600 Subject: [PATCH 06/13] fix: listen --- .../src/pages/workspace/[workspaceId]/[pageId].tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx index 54a1b0c7f8..b1f6bd4788 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx @@ -42,11 +42,11 @@ const Page: NextPageWithLayout = () => { let disposable: Disposable | undefined; const editor = createEditor?.current?.(currentPage!); + const isFirstPage = currentWorkspace?.meta.pageMetas.length === 1; if (editor) { editorContainer.current?.appendChild(editor); setEditor?.current?.(editor); if (currentPage!.isEmpty) { - const isFirstPage = currentWorkspace?.meta.pageMetas.length === 1; // Can not use useCurrentPageMeta to get new title, cause meta title will trigger rerender, but the second time can not remove title const { title: metaTitle } = currentPage!.meta; const title = metaTitle ? metaTitle : isFirstPage ? firstPageTitle : ''; @@ -72,12 +72,12 @@ const Page: NextPageWithLayout = () => { }); } currentPage!.resetHistory(); - disposable = editor.pageBlockModel?.propsUpdated.on(() => { - document.title = isFirstPage - ? firstPageTitle - : currentPage?.meta.title || 'Untitled'; - }); } + disposable = editor.pageBlockModel?.propsUpdated.on(() => { + document.title = isFirstPage + ? firstPageTitle + : currentPage?.meta.title || 'Untitled'; + }); } return () => { ret(); From 401a2ed07677bac24a2d12896e3b8dad97155f68 Mon Sep 17 00:00:00 2001 From: Chi Zhang Date: Sun, 29 Jan 2023 22:06:44 +0800 Subject: [PATCH 07/13] Update README.md --- README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a7cefa368d..9257321276 100644 --- a/README.md +++ b/README.md @@ -195,10 +195,25 @@ Thanks a lot to the community for providing such powerful and simple libraries, -## Jobs +## Hiring Some amazing companies including AFFiNE are looking for developers! Are you interested in helping build with AFFiNE and/or its partners? Check out some of the latest [jobs available](./docs/jobs/summary.md). + +## Upgrading + +For upgrading information please see our [update page](https://affine.pro/blog?tag=Release%20Note). + + +## Feature Request + +For feature request please see https://community.affine.pro/c/feature-requests/ + +## Is it awesome? + +[These people](https://twitter.com/AffineOfficial/followers) seem to like it. + + ## License See [LICENSE](/LICENSE) for details. From a36588f75ce9d2fae6e765e864b5de77a1e8c101 Mon Sep 17 00:00:00 2001 From: Chi Zhang Date: Sun, 29 Jan 2023 22:09:17 +0800 Subject: [PATCH 08/13] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9257321276..a595951b33 100644 --- a/README.md +++ b/README.md @@ -195,6 +195,10 @@ Thanks a lot to the community for providing such powerful and simple libraries, +## Free trial + +You can request a free trial of AFFiNE Ultimate [on our website](https://github.com/toeverything/AFFiNE/pkgs/container/affine-self-hosted). + ## Hiring Some amazing companies including AFFiNE are looking for developers! Are you interested in helping build with AFFiNE and/or its partners? Check out some of the latest [jobs available](./docs/jobs/summary.md). From 9e1edc9cee987b579551381f1b9c594f33d82482 Mon Sep 17 00:00:00 2001 From: ShortCipher5 Date: Tue, 31 Jan 2023 11:30:27 +0800 Subject: [PATCH 09/13] Update CONTRIBUTING.md Update branch information --- docs/CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index c278df5d3d..3cb668b373 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -12,8 +12,8 @@ Use the table of contents icon on the top left corner of this document to get to Currently we have two versions of AFFiNE: -- [AFFiNE Pre-Alpha](https://livedemo.affine.pro/). This version users the branch `master`, however is no longer actively developed and will be archived in the future. -- [AFFiNE Alpha](https://pathfinder.affine.pro/). This version uses the 'pathfinder' branch, this is the latest version under active development. We plan to update this to the master branch in the near future. +- [AFFiNE Pre-Alpha](https://livedemo.affine.pro/). This version users the branch `Pre-Alpha`, it is no longer actively developed but contains some different functions and features. +- [AFFiNE Alpha](https://pathfinder.affine.pro/). This version uses the `master` branch, this is the latest version under active development. To get an overview of the project, read the [README](../README.md). Here are some resources to help you get started with open source contributions: From f5521eb91a8426d81a1fe3d111bb44883c5ba610 Mon Sep 17 00:00:00 2001 From: "Pengyang(jackie)" <121489905+JackiePengp@users.noreply.github.com> Date: Tue, 31 Jan 2023 13:56:43 +0800 Subject: [PATCH 10/13] Update types-of-contributions.md --- docs/types-of-contributions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/types-of-contributions.md b/docs/types-of-contributions.md index 9e2a647a0f..14ececb849 100644 --- a/docs/types-of-contributions.md +++ b/docs/types-of-contributions.md @@ -26,4 +26,4 @@ You may be able to find additional help and information on our social media plat ### :earth_asia: Translations -AFFiNE is internationalized and available in multiple languages. The source content in this repository is written in English. We integrate with an external localization platform to work with the community in localizing the English content. You can find more info in our [internationalization docs](https://docs.affine.pro/affine/internationalization/welcome). +AFFiNE is internationalized and available in multiple languages. The source content in this repository is written in English. We integrate with an external localization platform to work with the community in localizing the English content. You can find more info on our community page, in our [i18n General Space ](https://community.affine.pro/c/i18n-general). From 822b6c9bb14bc416f54593b15f17e1597a4970d5 Mon Sep 17 00:00:00 2001 From: ShortCipher5 Date: Tue, 31 Jan 2023 14:16:30 +0800 Subject: [PATCH 11/13] Update README.md --- README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a595951b33..2b1769b0b9 100644 --- a/README.md +++ b/README.md @@ -90,19 +90,18 @@ Calling all developers, testers, tech writers and more! Contributions of all typ For **bug reports**, **feature requests** and other **suggestions** you can also [create a new issue](https://github.com/toeverything/AFFiNE/issues/new/choose) and choose the most appropiate template for your feedback. -For **translation** and **language support** you can visit our docs for the [internationalization guide](https://docs.affine.pro/affine/internationalization/welcome). +For **translation** and **language support** you can visit our [i18n General Space](https://community.affine.pro/c/i18n-general). -Looking for **others ways to contribute** and wondering where to start? Check out the [AFFiNE Ambassador program](https://docs.affine.pro/affine/affine-ambassadors/welcome), we work closely with passionate members of our community and provide them with a wide-range of support and resources. +Looking for **others ways to contribute** and wondering where to start? Check out the [AFFiNE Ambassador program](https://community.affine.pro/c/start-here/affine-ambassador), we work closely with passionate community members and provide them with a wide-range of support and resources. -If you have questions, join us across various [**social platforms**](https://docs.affine.pro/affine/community-links/official-communities) where our friendly community can help provide the answers. - -We have done a major refactoring recently, if you want to see our previous version of the code, please go to the [Pre-Alpha](https://github.com/toeverything/AFFiNE/tree/Pre-Alpha) branch to view +If you have questions, you are welcome to contact us. One of the best places to get more info and learn more is in the [AFFiNE Community](https://community.affine.pro) where you can engage with other like-minded individuals. ## Thanks We would also like to give thanks to open-source projects that make AFFiNE possible: -- [BlockSuite](https://github.com/toeverything/BlockSuite) - AFFiNE is built with and powered by BlockSuite. +- [BlockSuite](https://github.com/toeverything/BlockSuite) - 💠 BlockSuite is the open-source collaborative editor project behind AFFiNE. +- [OctoBase](https://github.com/toeverything/OctoBase) - 🐙 OctoBase is the open-source database behind AFFiNE, local-first, yet collaborative. A light-weight, scalable, data engine written in Rust. - [Yjs](https://github.com/yjs/yjs) & [Yrs](https://github.com/y-crdt/y-crdt) -- Fundamental support of CRDTs for our implementation on state management and data sync. - [React](https://github.com/facebook/react) -- View layer support and web GUI framework. - [Rust](https://github.com/rust-lang/rust) -- High performance language that extends the ability and availability of our real-time backend, OctoBase. From b3be0644329c2c0f283a07381b212c9b1bedc4e0 Mon Sep 17 00:00:00 2001 From: ShortCipher5 Date: Tue, 31 Jan 2023 16:48:39 +0800 Subject: [PATCH 12/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2b1769b0b9..251d554660 100644 --- a/README.md +++ b/README.md @@ -80,9 +80,9 @@ Before we tell you how to get started with AFFiNE, we'd like to shamelessly plug [![affine.pro](https://img.shields.io/static/v1?label=Try%20it%20Online&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAhpJREFUWEdjZEACtnl3MxgY/0YzMjAaMzAwcCLLUYH9/T/D/7MM/5mXHp6kPANmHiOI4Zx9Xfg3C+tKBob/zlSwiAgjGPey/vkdvneq5luwA+zy7+yhn+Vwv+89NFHFhREU7IyM/6YT4WyqK/n/nymT0Tb/1mFGBkYbqptOhIH/Gf4fYbTLv/2NBgmOCOvBSr6DHPCfWNW0UEe2A2x1uRlakiXBbtpx6jND+7KXZLmPbAdURokzeJjxwi31rrzH8OX7P5IdQbYDtnUoMXBzMMEt7Fj2imH7qU/0cQBy8MNsPHL5K0P13Of0cQB68MNsJScaSI4CHk4mhq3tSnCf3n36k0FZmh3Mn7L+DcPqgx9ICgWSHeBpxsdQESUGtgRk+eqDH+H8O09/MiR3P6atA1qTJRlsdLnhPgYlPOQQCW96wPDi3R+iHUFSCKAHP8wydEeREg0kOQA9+JOgwR1qL8CQEygC9jWp0UCSA+aVysIT3JqDHxgmr38DtlRCiIVhZZ0CPNhB6QDkEGIA0Q4gZAkuxxFyBNEOQA7ml+/+MIQ1PUAxG1kelAhB6YMYQLQDCPmQUAjhcgxRDiDWcEKOxOYIohyQGyjCEGIvANaPLfhhBiNHA6hmBBXNhABRDgCV/aBQAAFQpYMrn4PUgNTCACiXEMoNRDmAkC8okR8UDhjYRumAN8sHvGMCSkAD2jUDOWDAO6ewbDQQ3XMAy/oxKownQR0AAAAASUVORK5CYII=&message=%E2%86%92&style=for-the-badge)](https://affine.pro) No installation or registration required! Head over to our website and try it out now. -[AFFiNE Documentation](https://docs.affine.pro/affine/) - More detailed documentation on how to use and develop with AFFiNE +[AFFiNE Community](https://community.affine.pro) - Our wonderful community, where you can meet and engage with the team, developers and other like-minded enthusiastic user of AFFiNE. -[Our official communities](https://docs.affine.pro/affine/community-links/official-communities) - Join our friendly communities for more support and discussions +[Our official communities](https://community.affine.pro/c/start-here/) - Join our friendly communities for more support and discussions. ## Contributing From 65935eb8a18c6568172a214acb488263ee6f9fdf Mon Sep 17 00:00:00 2001 From: ShortCipher5 Date: Tue, 31 Jan 2023 16:50:34 +0800 Subject: [PATCH 13/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 251d554660..7c8e544e5c 100644 --- a/README.md +++ b/README.md @@ -194,9 +194,9 @@ Thanks a lot to the community for providing such powerful and simple libraries, -## Free trial +## Self-Host -You can request a free trial of AFFiNE Ultimate [on our website](https://github.com/toeverything/AFFiNE/pkgs/container/affine-self-hosted). +Get started with Docker and deploy your own feature-rich, restriction-free deployment of AFFiNE - check the [latest packages](https://github.com/toeverything/AFFiNE/pkgs/container/affine-self-hosted). ## Hiring