reanme flowy-workspace to flowy-core

This commit is contained in:
appflowy
2021-12-06 14:41:09 +08:00
parent cea83238eb
commit 29c14949cb
126 changed files with 114 additions and 804 deletions

View File

@ -8,7 +8,7 @@ members = [
"flowy-user",
"flowy-test",
"flowy-database",
"flowy-workspace",
"flowy-core",
"dart-notify",
"flowy-document",
]

View File

@ -1,5 +1,5 @@
[package]
name = "flowy-workspace"
name = "flowy-core"
version = "0.1.0"
edition = "2018"

View File

@ -1,9 +1,9 @@
use flowy_test::workspace::*;
use flowy_workspace::entities::{
use flowy_core::entities::{
app::QueryAppRequest,
trash::{TrashIdentifier, TrashType},
view::*,
};
use flowy_test::workspace::*;
#[tokio::test]
#[should_panic]

View File

@ -1,9 +1,9 @@
use flowy_test::{workspace::*, FlowyTest};
use flowy_workspace::entities::{
use flowy_core::entities::{
app::QueryAppRequest,
trash::{TrashIdentifier, TrashType},
view::*,
};
use flowy_test::{workspace::*, FlowyTest};
#[tokio::test]
#[should_panic]

View File

@ -1,9 +1,9 @@
use flowy_test::{builder::*, workspace::*, FlowyTest};
use flowy_workspace::{
use flowy_core::{
entities::workspace::{CreateWorkspaceRequest, QueryWorkspaceRequest},
event::WorkspaceEvent::*,
prelude::*,
};
use flowy_test::{builder::*, workspace::*, FlowyTest};
#[tokio::test]
async fn workspace_read_all() {

View File

@ -9,7 +9,7 @@ edition = "2018"
lib-dispatch = { path = "../lib-dispatch" }
lib-log = { path = "../lib-log" }
flowy-user = { path = "../flowy-user" }
flowy-workspace = { path = "../flowy-workspace", default-features = false }
flowy-core = { path = "../flowy-core", default-features = false }
flowy-database = { path = "../flowy-database" }
flowy-document = { path = "../flowy-document" }
lib-infra = { path = "../lib-infra" }
@ -36,5 +36,5 @@ tokio = { version = "1", features = ["full"]}
futures-util = "0.3.15"
[features]
http_server = ["flowy-user/http_server", "flowy-workspace/http_server", "flowy-document/http_server"]
http_server = ["flowy-user/http_server", "flowy-core/http_server", "flowy-document/http_server"]
use_bunyan = ["lib-log/use_bunyan"]

View File

@ -1,9 +1,9 @@
use flowy_database::ConnectionPool;
use flowy_user::services::user::UserSession;
use flowy_workspace::{
use flowy_core::{
errors::WorkspaceError,
module::{WorkspaceDatabase, WorkspaceUser},
};
use flowy_database::ConnectionPool;
use flowy_user::services::user::UserSession;
use std::sync::Arc;
pub struct WorkspaceDepsResolver {

View File

@ -3,12 +3,12 @@ mod deps_resolve;
pub mod module;
use crate::deps_resolve::WorkspaceDepsResolver;
use backend_service::configuration::ClientServerConfiguration;
use flowy_core::{errors::WorkspaceError, prelude::WorkspaceController};
use flowy_document::module::FlowyDocument;
use flowy_user::{
prelude::UserStatus,
services::user::{UserSession, UserSessionConfig},
};
use flowy_workspace::{errors::WorkspaceError, prelude::WorkspaceController};
use lib_dispatch::prelude::*;
use lib_infra::entities::network_state::NetworkType;
use module::mk_modules;
@ -177,5 +177,5 @@ fn mk_workspace_controller(
) -> Arc<WorkspaceController> {
let workspace_deps = WorkspaceDepsResolver::new(user_session);
let (user, database) = workspace_deps.split_into();
flowy_workspace::module::init_workspace_controller(user, database, flowy_document, server_config)
flowy_core::module::init_workspace_controller(user, database, flowy_document, server_config)
}

View File

@ -1,8 +1,8 @@
use crate::deps_resolve::DocumentDepsResolver;
use backend_service::configuration::ClientServerConfiguration;
use flowy_core::prelude::WorkspaceController;
use flowy_document::module::FlowyDocument;
use flowy_user::services::user::UserSession;
use flowy_workspace::prelude::WorkspaceController;
use lib_dispatch::prelude::Module;
use std::sync::Arc;
@ -15,7 +15,7 @@ pub fn mk_modules(workspace_controller: Arc<WorkspaceController>, user_session:
fn mk_user_module(user_session: Arc<UserSession>) -> Module { flowy_user::module::create(user_session) }
fn mk_workspace_module(workspace_controller: Arc<WorkspaceController>) -> Module {
flowy_workspace::module::create(workspace_controller)
flowy_core::module::create(workspace_controller)
}
pub fn mk_document_module(

View File

@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
flowy-sdk = { path = "../flowy-sdk"}
flowy-user = { path = "../flowy-user"}
flowy-workspace = { path = "../flowy-workspace", default-features = false}
flowy-core = { path = "../flowy-core", default-features = false}
flowy-document = { path = "../flowy-document"}
lib-dispatch = { path = "../lib-dispatch" }
lib-infra = { path = "../lib-infra" }

View File

@ -8,9 +8,9 @@ use std::{
use crate::FlowyTestSDK;
use lib_dispatch::prelude::*;
use flowy_core::errors::WorkspaceError;
use flowy_sdk::*;
use flowy_user::errors::UserError;
use flowy_workspace::errors::WorkspaceError;
use std::{convert::TryFrom, marker::PhantomData, sync::Arc};
pub type FlowyWorkspaceTest = Builder<WorkspaceError>;

View File

@ -2,16 +2,16 @@ use bytes::Bytes;
use lib_dispatch::prelude::{EventDispatcher, ModuleRequest, ToBytes};
use lib_infra::{kv::KV, uuid};
use flowy_core::{
entities::workspace::{CreateWorkspaceRequest, QueryWorkspaceRequest, Workspace},
errors::WorkspaceError,
event::WorkspaceEvent::{CreateWorkspace, OpenWorkspace},
};
use flowy_user::{
entities::{SignInRequest, SignUpRequest, UserProfile},
errors::UserError,
event::UserEvent::{SignIn, SignOut, SignUp},
};
use flowy_workspace::{
entities::workspace::{CreateWorkspaceRequest, QueryWorkspaceRequest, Workspace},
errors::WorkspaceError,
event::WorkspaceEvent::{CreateWorkspace, OpenWorkspace},
};
use std::{fs, path::PathBuf, sync::Arc};
pub fn root_dir() -> String {

View File

@ -1,6 +1,5 @@
use crate::prelude::*;
use flowy_document_infra::entities::doc::Doc;
use flowy_workspace::{
use flowy_core::{
entities::{
app::*,
trash::{RepeatedTrash, TrashIdentifier},
@ -10,6 +9,7 @@ use flowy_workspace::{
errors::ErrorCode,
event::WorkspaceEvent::*,
};
use flowy_document_infra::entities::doc::Doc;
pub struct WorkspaceTest {
pub sdk: FlowyTestSDK,