From e89e40d652cc75c853031c13ad949a5cbd7ab05a Mon Sep 17 00:00:00 2001 From: "Lucas.Xu" Date: Tue, 26 Jul 2022 11:58:21 +0800 Subject: [PATCH 1/9] fix: update faccess version from 0.2.3 to 0.2.4 for fixing linux-arm64 building (https://github.com/Freaky/faccess/pull/1) --- frontend/rust-lib/Cargo.lock | 4 ++-- shared-lib/Cargo.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lock index d452c1a025..643237bfe6 100644 --- a/frontend/rust-lib/Cargo.lock +++ b/frontend/rust-lib/Cargo.lock @@ -754,9 +754,9 @@ dependencies = [ [[package]] name = "faccess" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e039175679baf763ddddf4f76900b92d4dae9411ee88cf42d2f11b976b09e07c" +checksum = "59ae66425802d6a903e268ae1a08b8c38ba143520f227a205edf4e9c7e3e26d5" dependencies = [ "bitflags", "libc", diff --git a/shared-lib/Cargo.lock b/shared-lib/Cargo.lock index 62d70be943..9b8e5f6081 100644 --- a/shared-lib/Cargo.lock +++ b/shared-lib/Cargo.lock @@ -332,9 +332,9 @@ dependencies = [ [[package]] name = "faccess" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e039175679baf763ddddf4f76900b92d4dae9411ee88cf42d2f11b976b09e07c" +checksum = "59ae66425802d6a903e268ae1a08b8c38ba143520f227a205edf4e9c7e3e26d5" dependencies = [ "bitflags", "libc", From 0c20a7b092cbc1e40a33f64ddb4391d322cec85e Mon Sep 17 00:00:00 2001 From: Poly-Pixel <79737178+Poly-Pixel@users.noreply.github.com> Date: Tue, 26 Jul 2022 22:25:44 -0400 Subject: [PATCH 2/9] fix: fix yaml syntax in rust_lint github workflow --- .github/workflows/rust_lint.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rust_lint.yml b/.github/workflows/rust_lint.yml index 4f364a616a..3401b5b9bb 100644 --- a/.github/workflows/rust_lint.yml +++ b/.github/workflows/rust_lint.yml @@ -17,9 +17,9 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 - with: - toolchain: 'stable-2022-01-20' - override: true + with: + toolchain: 'stable-2022-01-20' + override: true - name: Rust Deps working-directory: frontend @@ -40,7 +40,7 @@ jobs: - run: rustup component add clippy - working-directory: frontend/rust-lib + working-directory: frontend/rust-lib - name: clippy run: cargo clippy --no-default-features working-directory: frontend/rust-lib From 16fdad83c2e210959e1a070d16d12c586ae8fdcf Mon Sep 17 00:00:00 2001 From: MikeWallaceDev Date: Tue, 26 Jul 2022 22:42:58 -0400 Subject: [PATCH 3/9] fix: moved the roadmap to gitbook --- ROADMAP.md | 58 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/ROADMAP.md b/ROADMAP.md index d7c893f809..8cd26e20d2 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,56 +1,2 @@ -# View the official [AppFlowy public roadmap](https://github.com/orgs/AppFlowy-IO/projects/5/views/12) -Our [roadmap](https://github.com/orgs/AppFlowy-IO/projects/5/views/12) is where you can learn about the features we’re working on, their status, when we expect to release them, and how you can help us. Have any questions or comments about items on the roadmap? Or feedback about the roadmap itself, such as how issues are presented? Share your feedback via the [discussions](https://github.com/AppFlowy-IO/AppFlowy/discussions). - - -## Guide to the roadmap - -### Labels -Every item on the roadmap is an issue, with labels that indicate each of the following: -- bug: something needs fixing -- new feature: this is something new for the end user -- improvements: an improvement on an existing feature -- documentation: this is a documentation task -- needs design: this requires a design spec -- grid: features related to Flowy Grid -- editor: features related to Flowy Editor -- help-wanted: for the community members to claim -- first time issue for devs: for the community members to claim -- first time issue for experienced devs: for the experienced community developers to claim - -### Item Status -“Status” indicates the stages that the feature goes through, from “Need triage” to “Done”. Most of the options are self explanatory.: -- Need triage -- Need test for Windows / Linux / macOS -- Wait for reporter -- Ready for assess -- Planned: included in our plan -- Not Planned: decided against it -- ToDo: in the queue of the upcoming development (next two releases) -- In progress: currently in development -- Blocked: have started but can’t proceed as it is blocked by something -- Done: the development is finished and merged into the main branch - - -### Milestones -The roadmap is arranged on a project board to give a sense of how far out each item is on the horizon. If a feature is planned, it is already or will be added to a particular milestone, aka release. For example, “Implement FlowyEditor’s RichText component” is added to v0.0.7. You will also find issues that are not planned for which no milestone is yet available. In addition, you can see a list of milestones that are already planned and track their progress [here](https://github.com/AppFlowy-IO/AppFlowy/milestones). - -### Views -To easily track the project based on your interest, we organize issues into different views as follows: -- [Roadmap](https://github.com/orgs/AppFlowy-IO/projects/5/views/12) -- [v0.0.x](https://github.com/orgs/AppFlowy-IO/projects/5/views/1) -- [Upcoming](https://github.com/orgs/AppFlowy-IO/projects/5/views/3) -- [Help Wanted](https://github.com/orgs/AppFlowy-IO/projects/5/views/4) -- [Editor](https://github.com/orgs/AppFlowy-IO/projects/5/views/5) -- [Grid](https://github.com/orgs/AppFlowy-IO/projects/5/views/6) -- [Bug Tracker](https://github.com/orgs/AppFlowy-IO/projects/5/views/9) - -If you are interested in contributing to AppFlowy, please have a look at the “[Help Wanted](https://github.com/orgs/AppFlowy-IO/projects/5/views/4)” tab where we maintain a list of issues open to the community. -Flowy Editor and Flowy Grid are two key components AppFlowy offers. Flowy Editor is a rich-text editor. Flowy Grid is a database component that can be inserted into Flowy Editor. Both components are developed by AppFlowy’s team from the ground up. You can use the “Editor” and the “Grid” tab to track the development progress of these two components. - -## Disclaimer -The roadmap is subject to change, especially further out on the timeline. Any statement in this repository that is not purely historical is considered a forward-looking statement. The forward-looking roadmap does not represent a commitment, guarantee, obligation or promise to deliver any product or feature, or the deliver any product and feature by any particular date, and is intended to outline the general development plans. - - -## Acknowledgements -This article is adapted from GitHub public roadmap’s [README.md](https://github.com/github/roadmap) - +# Find information about our official [AppFlowy public roadmap](https://appflowy.gitbook.io/docs/essential-documentation/roadmap) on Gitbook. +Our [roadmap](https://appflowy.gitbook.io/docs/essential-documentation/roadmap) is where you can learn about the features we’re working on, their status, when we expect to release them, and how you can help us. \ No newline at end of file From 1e813524ebf60353b7b9579425770b94ac85f1aa Mon Sep 17 00:00:00 2001 From: Annie Date: Wed, 27 Jul 2022 17:29:47 +0800 Subject: [PATCH 4/9] chore: update ROADMAP.md update links and reorder the contents --- ROADMAP.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ROADMAP.md b/ROADMAP.md index 8cd26e20d2..53ac484771 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1,2 +1,3 @@ -# Find information about our official [AppFlowy public roadmap](https://appflowy.gitbook.io/docs/essential-documentation/roadmap) on Gitbook. -Our [roadmap](https://appflowy.gitbook.io/docs/essential-documentation/roadmap) is where you can learn about the features we’re working on, their status, when we expect to release them, and how you can help us. \ No newline at end of file +## Our [roadmap](https://github.com/orgs/AppFlowy-IO/projects/5/views/12) is where you can learn about the features we’re working on, their status, when we expect to release them, and how you can help us. + +## Find more information about how to use our official AppFlowy public roadmap on [Gitbook](https://appflowy.gitbook.io/docs/essential-documentation/roadmap). From 17409213a340500bbd751082116d7b3ecb368f25 Mon Sep 17 00:00:00 2001 From: Annie Date: Wed, 27 Jul 2022 17:32:57 +0800 Subject: [PATCH 5/9] chore: update README.md Update the roadmap readme linking to GitBook --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09538537dd..2a2ae6f8af 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Please view the [documentation](https://appflowy.gitbook.io/docs/essential-docum ## Roadmap -- [AppFlowy Roadmap ReadMe](https://github.com/AppFlowy-IO/AppFlowy/blob/main/ROADMAP.md) +- [AppFlowy Roadmap ReadMe](https://appflowy.gitbook.io/docs/essential-documentation/roadmap) - [AppFlowy Public Roadmap](https://github.com/orgs/AppFlowy-IO/projects/5/views/12) If you'd like to propose a feature, submit an issue [here](https://github.com/AppFlowy-IO/appflowy/issues). From 5eb8a60f911c480915c6a50466cadfed9fd374ac Mon Sep 17 00:00:00 2001 From: Poly-Pixel <79737178+Poly-Pixel@users.noreply.github.com> Date: Wed, 27 Jul 2022 10:02:22 -0400 Subject: [PATCH 6/9] fix: add flutter action for access to dart --- .github/workflows/rust_lint.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/rust_lint.yml b/.github/workflows/rust_lint.yml index 3401b5b9bb..83ecd62280 100644 --- a/.github/workflows/rust_lint.yml +++ b/.github/workflows/rust_lint.yml @@ -20,6 +20,10 @@ jobs: with: toolchain: 'stable-2022-01-20' override: true + - uses: subosito/flutter-action@v1 + with: + flutter-version: '3.0.0' + channel: "stable" - name: Rust Deps working-directory: frontend From 5309b2a7574fcf6c81ffbe614b22591200e31f81 Mon Sep 17 00:00:00 2001 From: Poly-Pixel <79737178+Poly-Pixel@users.noreply.github.com> Date: Wed, 27 Jul 2022 10:42:33 -0400 Subject: [PATCH 7/9] style: run cargo fmt --- .../rust-lib/flowy-grid/src/entities/cell_entities.rs | 2 -- .../rust-lib/flowy-grid/src/entities/field_entities.rs | 8 -------- frontend/rust-lib/flowy-grid/src/entities/row_entities.rs | 1 - .../date_type_option/date_type_option_entities.rs | 2 +- .../type_options/selection_type_option/select_option.rs | 2 +- .../rust-lib/flowy-grid/tests/grid/block_test/script.rs | 2 +- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs index 30e8d65018..6c5402b340 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/cell_entities.rs @@ -1,4 +1,3 @@ - use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; use flowy_grid_data_model::parser::NotEmptyStr; @@ -21,7 +20,6 @@ pub struct CreateSelectOptionParams { pub field_id: String, pub grid_id: String, pub option_name: String, - } impl TryInto for CreateSelectOptionPayloadPB { diff --git a/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs index 760b820233..695dd0e326 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/field_entities.rs @@ -155,8 +155,6 @@ pub struct GetEditFieldContextPayloadPB { pub field_type: FieldType, } - - #[derive(Debug, Default, ProtoBuf)] pub struct CreateFieldPayloadPB { #[pb(index = 1)] @@ -192,8 +190,6 @@ impl TryInto for CreateFieldPayloadPB { } } - - #[derive(Debug, Default, ProtoBuf)] pub struct EditFieldPayloadPB { #[pb(index = 1)] @@ -241,7 +237,6 @@ pub struct GridFieldTypeOptionIdPB { pub field_type: FieldType, } - pub struct GridFieldTypeOptionIdParams { pub grid_id: String, pub field_id: String, @@ -619,7 +614,6 @@ pub struct DuplicateFieldPayloadPB { pub grid_id: String, } - #[derive(Debug, Clone, Default, ProtoBuf)] pub struct GridFieldIdentifierPayloadPB { #[pb(index = 1)] @@ -668,5 +662,3 @@ pub struct GridFieldIdParams { pub field_id: String, pub grid_id: String, } - - diff --git a/frontend/rust-lib/flowy-grid/src/entities/row_entities.rs b/frontend/rust-lib/flowy-grid/src/entities/row_entities.rs index d8ae0eba7a..745a5dc368 100644 --- a/frontend/rust-lib/flowy-grid/src/entities/row_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/entities/row_entities.rs @@ -2,7 +2,6 @@ use flowy_derive::ProtoBuf; use flowy_error::ErrorCode; use flowy_grid_data_model::parser::NotEmptyStr; - #[derive(Debug, Default, Clone, ProtoBuf)] pub struct GridRowIdPB { #[pb(index = 1)] diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs index d5da516bf1..1c54606f75 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs @@ -1,5 +1,5 @@ use crate::entities::CellChangesetPB; -use crate::entities::{GridCellIdParams, GridCellIdPB}; +use crate::entities::{GridCellIdPB, GridCellIdParams}; use crate::services::cell::{CellBytesParser, FromCellChangeset, FromCellString}; use bytes::Bytes; diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_option.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_option.rs index 8f441e1755..b945be430a 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_option.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/selection_type_option/select_option.rs @@ -1,4 +1,4 @@ -use crate::entities::{CellChangesetPB, GridCellIdParams, FieldType, GridCellIdPB}; +use crate::entities::{CellChangesetPB, FieldType, GridCellIdPB, GridCellIdParams}; use crate::services::cell::{CellBytes, CellBytesParser, CellData, CellDisplayable, FromCellChangeset, FromCellString}; use crate::services::field::{MultiSelectTypeOption, SingleSelectTypeOptionPB}; use bytes::Bytes; diff --git a/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs b/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs index 9516fd1d03..14671c2eb2 100644 --- a/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs +++ b/frontend/rust-lib/flowy-grid/tests/grid/block_test/script.rs @@ -2,7 +2,7 @@ use crate::grid::block_test::script::RowScript::{AssertCell, CreateRow}; use crate::grid::block_test::util::GridRowTestBuilder; use crate::grid::grid_editor::GridEditorTest; -use flowy_grid::entities::{GridCellIdParams, FieldType, GridRowPB}; +use flowy_grid::entities::{FieldType, GridCellIdParams, GridRowPB}; use flowy_grid::services::field::*; use flowy_grid_data_model::revision::{ GridBlockMetaRevision, GridBlockMetaRevisionChangeset, RowMetaChangeset, RowRevision, From 62b968bdfa06aa40d9c3b41745cb5e3341fc1475 Mon Sep 17 00:00:00 2001 From: Annie Date: Thu, 28 Jul 2022 19:44:35 +0800 Subject: [PATCH 8/9] chore: update roadmap.md --- doc/roadmap.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/roadmap.md b/doc/roadmap.md index b5d7e368c9..54bef7f99b 100644 --- a/doc/roadmap.md +++ b/doc/roadmap.md @@ -1 +1,3 @@ -https://trello.com/b/NCyXCXXh/appflowy-roadmap +[AppFlowy Roadmap ReadMe](https://appflowy.gitbook.io/docs/essential-documentation/roadmap) + +[AppFlowy Public Roadmap](https://github.com/orgs/AppFlowy-IO/projects/5/views/12) From 781d62002f7acda1d9e50d0d0486c682ca779071 Mon Sep 17 00:00:00 2001 From: Dennis Ziolkowski Date: Wed, 20 Jul 2022 22:27:32 +0200 Subject: [PATCH 9/9] fix: Update README.md Changed appearance of the "howtostar.gif". It was width="1000", which leads to a messy layout. Also changed the alt text for the image to a better suiting one. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a2ae6f8af..e441496c96 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Please view the [documentation](https://appflowy.gitbook.io/docs/essential-docum ## Stay Up-to-Date -

AppFlowy Github

+

AppFlowy Github - how to star the repo

## Getting Started with development Please view the [documentation](https://appflowy.gitbook.io/docs/essential-documentation/contribute-to-appflowy) for OS specific development instructions