Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
refactor: tauri folder (#1738)
Nathan.fooo67f07463f07c
diff --git a/frontend/.vscode/launch.json b/frontend/.vscode/launch.jsonindex 39c80de2cf..0ae3d733df 100644--- a/frontend/.vscode/launch.json+++ b/frontend/.vscode/launch.json@@ -92,9 +92,10 @@"cwd": "${workspaceRoot}/app_flowy"},{+ // https://tauri.app/v1/guides/debugging/vs-code"type": "lldb","request": "launch",- "name": "AF-tauri: Dev",+ "name": "AF-tauri: Debug backend","cargo": {"args": ["build",@@ -102,7 +103,7 @@"--no-default-features"]},- "preLaunchTask": "AF: Tauri Dev",+ "preLaunchTask": "AF: Tauri UI Dev","cwd": "${workspaceRoot}/appflowy_tauri/"},{diff --git a/frontend/.vscode/tasks.json b/frontend/.vscode/tasks.jsonindex 10bc312c23..c40b5390c9 100644--- a/frontend/.vscode/tasks.json+++ b/frontend/.vscode/tasks.json@@ -20,7 +20,7 @@"AF: Flutter Pub Get","AF: Flutter Package Get","AF: Generate Language Files",- "AF: Generate Freezed Files",+ "AF: Generate Freezed Files"],"presentation": {"reveal": "always",@@ -38,12 +38,12 @@"AF: Flutter Pub Get","AF: Flutter Package Get","AF: Generate Language Files",- "AF: Generate Freezed Files",+ "AF: Generate Freezed Files"],"presentation": {"reveal": "always",- "panel": "new",- },+ "panel": "new"+ }},{"label": "AF: build_flowy_sdk_for_android",@@ -187,11 +187,20 @@"detail": "app_flowy"},{- "label": "AF: Tauri Dev",+ "label": "AF: Tauri UI Dev","type": "shell","isBackground": true,- "command": "npm run dev",- "problemMatcher": [],+ "command": "yarn dev",+ "problemMatcher": ["$tsc"],+ "options": {+ "cwd": "${workspaceFolder}/appflowy_tauri"+ }+ },+ {+ "label": "AF: Tauri Dev",+ "type": "shell",+ "command": "npm run tauri dev",+ "problemMatcher": ["$tsc"],"options": {"cwd": "${workspaceFolder}/appflowy_tauri"}@@ -202,7 +211,20 @@"command": "cargo make tauri_clean","options": {"cwd": "${workspaceFolder}"- }+ },+ "problemMatcher": ["$tsc"],},+ {+ "label": "AF: Tauri Clean + Dev",+ "type": "shell",+ "dependsOrder": "sequence",+ "dependsOn": [+ "AF: Tauri Clean",+ "AF: Tauri UI Dev"+ ],+ "options": {+ "cwd": "${workspaceFolder}"+ }+ }]}\ No newline at end of filediff --git a/frontend/Makefile.toml b/frontend/Makefile.tomlindex 9edb2919c0..16c7e80b96 100644--- a/frontend/Makefile.toml+++ b/frontend/Makefile.toml@@ -44,7 +44,7 @@ CRATE_TYPE = "staticlib"LIB_EXT = "a"APP_ENVIRONMENT = "local"FLUTTER_FLOWY_SDK_PATH = "app_flowy/packages/appflowy_backend"-TAURI_PROTOBUF_PATH = "appflowy_tauri/src/protobuf"+TAURI_BACKEND_SERVICE_PATH = "appflowy_tauri/src/services/backend"# Test default configTEST_CRATE_TYPE = "cdylib"TEST_LIB_EXT = "dylib"diff --git a/frontend/appflowy_tauri/.gitignore b/frontend/appflowy_tauri/.gitignoreindex 436967f542..b88d2d0637 100644--- a/frontend/appflowy_tauri/.gitignore+++ b/frontend/appflowy_tauri/.gitignore@@ -23,5 +23,5 @@ dist-ssr*.sln*.sw?-**/src/protobuf/classes/-**/src/protobuf/events/\ No newline at end of file+**/src/services/backend/classes/+**/src/services/backend/events/\ No newline at end of filediff --git a/frontend/appflowy_tauri/src-tauri/build.rs b/frontend/appflowy_tauri/src-tauri/build.rsindex 4b4e6edf99..d860e1e6a7 100644--- a/frontend/appflowy_tauri/src-tauri/build.rs+++ b/frontend/appflowy_tauri/src-tauri/build.rs@@ -1,7 +1,3 @@-use std::env;fn main() {- env::set_var("TAURI_PROTOBUF_PATH", "appflowy_tauri/src/protobuf");- env::set_var("CARGO_MAKE_WORKING_DIRECTORY", "../../../");-tauri_build::build()}diff --git a/frontend/appflowy_tauri/src/App.css b/frontend/appflowy_tauri/src/appflowy_app/App.csssimilarity index 100%rename from frontend/appflowy_tauri/src/App.cssrename to frontend/appflowy_tauri/src/appflowy_app/App.cssdiff --git a/frontend/appflowy_tauri/src/App.tsx b/frontend/appflowy_tauri/src/appflowy_app/App.tsxsimilarity index 92%rename from frontend/appflowy_tauri/src/App.tsxrename to frontend/appflowy_tauri/src/appflowy_app/App.tsxindex f8808aa809..fca8cd6137 100644--- a/frontend/appflowy_tauri/src/App.tsx+++ b/frontend/appflowy_tauri/src/appflowy_app/App.tsx@@ -2,7 +2,7 @@ import "./App.css";import {UserEventSignIn,SignInPayloadPB,-} from "./protobuf/events/flowy-user";+} from "../services/backend/events/flowy-user";import { nanoid } from "nanoid";diff --git a/frontend/appflowy_tauri/src/home/application/RemoveMeAction.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/application/RemoveMeAction.tssimilarity index 100%rename from frontend/appflowy_tauri/src/home/application/RemoveMeAction.tsrename to frontend/appflowy_tauri/src/appflowy_app/components/grid/application/RemoveMeAction.tsdiff --git a/frontend/appflowy_tauri/src/home/application/RemoveMeReducer.test.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/application/RemoveMeReducer.test.tssimilarity index 100%rename from frontend/appflowy_tauri/src/home/application/RemoveMeReducer.test.tsrename to frontend/appflowy_tauri/src/appflowy_app/components/grid/application/RemoveMeReducer.test.tsdiff --git a/frontend/appflowy_tauri/src/home/application/RemoveMeReducer.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/application/RemoveMeReducer.tssimilarity index 100%rename from frontend/appflowy_tauri/src/home/application/RemoveMeReducer.tsrename to frontend/appflowy_tauri/src/appflowy_app/components/grid/application/RemoveMeReducer.tsdiff --git a/frontend/appflowy_tauri/src/home/index.ts b/frontend/appflowy_tauri/src/appflowy_app/components/grid/index.tssimilarity index 100%rename from frontend/appflowy_tauri/src/home/index.tsrename to frontend/appflowy_tauri/src/appflowy_app/components/grid/index.tsdiff --git a/frontend/appflowy_tauri/src/home/presentation/RemoveMeComponent.test.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/grid/presentation/RemoveMeComponent.test.tsxsimilarity index 100%rename from frontend/appflowy_tauri/src/home/presentation/RemoveMeComponent.test.tsxrename to frontend/appflowy_tauri/src/appflowy_app/components/grid/presentation/RemoveMeComponent.test.tsxdiff --git a/frontend/appflowy_tauri/src/home/presentation/RemoveMeComponent.tsx b/frontend/appflowy_tauri/src/appflowy_app/components/grid/presentation/RemoveMeComponent.tsxsimilarity index 100%rename from frontend/appflowy_tauri/src/home/presentation/RemoveMeComponent.tsxrename to frontend/appflowy_tauri/src/appflowy_app/components/grid/presentation/RemoveMeComponent.tsxdiff --git a/frontend/appflowy_tauri/src/plugins/grid/index.ts b/frontend/appflowy_tauri/src/appflowy_app/components/index.tssimilarity index 100%rename from frontend/appflowy_tauri/src/plugins/grid/index.tsrename to frontend/appflowy_tauri/src/appflowy_app/components/index.tsdiff --git a/frontend/appflowy_tauri/src/plugins/grid/application/RemoveMeAction.ts b/frontend/appflowy_tauri/src/appflowy_app/home/application/RemoveMeAction.tssimilarity index 100%rename from frontend/appflowy_tauri/src/plugins/grid/application/RemoveMeAction.tsrename to frontend/appflowy_tauri/src/appflowy_app/home/application/RemoveMeAction.tsdiff --git a/frontend/appflowy_tauri/src/plugins/grid/application/RemoveMeReducer.test.ts b/frontend/appflowy_tauri/src/appflowy_app/home/application/RemoveMeReducer.test.tssimilarity index 100%rename from frontend/appflowy_tauri/src/plugins/grid/application/RemoveMeReducer.test.tsrename to frontend/appflowy_tauri/src/appflowy_app/home/application/RemoveMeReducer.test.tsdiff --git a/frontend/appflowy_tauri/src/plugins/grid/application/RemoveMeReducer.ts b/frontend/appflowy_tauri/src/appflowy_app/home/application/RemoveMeReducer.tssimilarity index 100%rename from frontend/appflowy_tauri/src/plugins/grid/application/RemoveMeReducer.tsrename to frontend/appflowy_tauri/src/appflowy_app/home/application/RemoveMeReducer.tsdiff --git a/frontend/appflowy_tauri/src/plugins/index.ts b/frontend/appflowy_tauri/src/appflowy_app/home/index.tssimilarity index 100%rename from frontend/appflowy_tauri/src/plugins/index.tsrename to frontend/appflowy_tauri/src/appflowy_app/home/index.tsdiff --git a/frontend/appflowy_tauri/src/plugins/grid/presentation/RemoveMeComponent.test.tsx b/frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.test.tsxsimilarity index 100%rename from frontend/appflowy_tauri/src/plugins/grid/presentation/RemoveMeComponent.test.tsxrename to frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.test.tsxdiff --git a/frontend/appflowy_tauri/src/plugins/grid/presentation/RemoveMeComponent.tsx b/frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.tsxsimilarity index 100%rename from frontend/appflowy_tauri/src/plugins/grid/presentation/RemoveMeComponent.tsxrename to frontend/appflowy_tauri/src/appflowy_app/home/presentation/RemoveMeComponent.tsxdiff --git a/frontend/appflowy_tauri/src/startup/index.ts b/frontend/appflowy_tauri/src/appflowy_app/index.tssimilarity index 100%rename from frontend/appflowy_tauri/src/startup/index.tsrename to frontend/appflowy_tauri/src/appflowy_app/index.tsdiff --git a/frontend/appflowy_tauri/src/style.css b/frontend/appflowy_tauri/src/appflowy_app/style.csssimilarity index 100%rename from frontend/appflowy_tauri/src/style.cssrename to frontend/appflowy_tauri/src/appflowy_app/style.cssdiff --git a/frontend/appflowy_tauri/src/vite-env.d.ts b/frontend/appflowy_tauri/src/appflowy_app/vite-env.d.tssimilarity index 100%rename from frontend/appflowy_tauri/src/vite-env.d.tsrename to frontend/appflowy_tauri/src/appflowy_app/vite-env.d.tsdiff --git a/frontend/appflowy_tauri/src/main.tsx b/frontend/appflowy_tauri/src/main.tsxindex 7d6d78e120..514bcbdd0b 100644--- a/frontend/appflowy_tauri/src/main.tsx+++ b/frontend/appflowy_tauri/src/main.tsx@@ -1,7 +1,7 @@import React from "react";import ReactDOM from "react-dom/client";-import App from "./App";-import "./style.css";+import App from "./appflowy_app/App";+import "./appflowy_app/style.css";ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(<React.StrictMode>diff --git a/frontend/appflowy_tauri/src/protobuf/classes.ts b/frontend/appflowy_tauri/src/services/backend/index.tssimilarity index 100%rename from frontend/appflowy_tauri/src/protobuf/classes.tsrename to frontend/appflowy_tauri/src/services/backend/index.tsdiff --git a/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs b/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rsindex 96a7c691c3..046687b3b0 100644--- a/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs+++ b/frontend/rust-lib/flowy-codegen/src/protobuf_file/mod.rs@@ -101,11 +101,12 @@ fn generate_ts_protobuf_files(protoc_bin_path: &Path,) {let root = std::env::var("CARGO_MAKE_WORKING_DIRECTORY").unwrap_or("../../".to_string());- let tauri_protobuf_path = std::env::var("TAURI_PROTOBUF_PATH").unwrap_or("appflowy_tauri/src/protobuf".to_string());+ let tauri_backend_service_path =+ std::env::var("TAURI_BACKEND_SERVICE_PATH").unwrap_or("appflowy_tauri/src/services/backend".to_string());let mut output = PathBuf::new();output.push(root);- output.push(tauri_protobuf_path);+ output.push(tauri_backend_service_path);output.push("classes");output.push(name);diff --git a/frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs b/frontend/rust-lib/flowy-codegen/src/ts_event/mod.rsindex 796b4d7941..017f045e62 100644--- a/frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs+++ b/frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs@@ -14,7 +14,8 @@ use walkdir::WalkDir;pub fn gen(crate_name: &str) {let root = std::env::var("CARGO_MAKE_WORKING_DIRECTORY").unwrap_or("../../".to_string());- let tauri_protobuf_path = std::env::var("TAURI_PROTOBUF_PATH").unwrap_or("appflowy_tauri/src/protobuf".to_string());+ let tauri_backend_service_path =+ std::env::var("TAURI_BACKEND_SERVICE_PATH").unwrap_or("appflowy_tauri/src/services/backend".to_string());let crate_path = std::fs::canonicalize(".").unwrap().as_path().display().to_string();let event_crates = parse_ts_event_files(vec![crate_path]);@@ -31,7 +32,9 @@ pub fn gen(crate_name: &str) {}render_result.push_str(TS_FOOTER);- let ts_event_folder: PathBuf = [&root, &tauri_protobuf_path, "events", crate_name].iter().collect();+ let ts_event_folder: PathBuf = [&root, &tauri_backend_service_path, "events", crate_name]+ .iter()+ .collect();if !ts_event_folder.as_path().exists() {std::fs::create_dir_all(ts_event_folder.as_path()).unwrap();}@@ -185,7 +188,7 @@ const TS_HEADER: &str = r#"/// Auto generate. Do not editimport { Ok, Err, Result } from "ts-results";import { invoke } from "@tauri-apps/api/tauri";-import * as pb from "../../classes";+import * as pb from "../..";"#;const TS_FOOTER: &str = r#"diff --git a/frontend/scripts/makefile/tauri.toml b/frontend/scripts/makefile/tauri.tomlindex 3d7058ac3d..58166b06a5 100644--- a/frontend/scripts/makefile/tauri.toml+++ b/frontend/scripts/makefile/tauri.toml@@ -1,17 +1,3 @@----[tasks.tauri_env]-script_runner = "@rust"-script = '''-//! ```cargo-use std::env;-fn main() {- env.set_var("TAURI_PROTOBUF_PATH", "appflowy_tauri/src/protobuf");-}-'''--[tasks.tauri_build]script = ["""cd appflowy_tauri/src-tauri@@ -45,7 +31,7 @@ run_task = { name = [[tasks.rm_tauri_generated_protobuf_files]private = truescript = ["""- protobuf_file_paths = glob_array ${TAURI_PROTOBUF_PATH}/classes+ protobuf_file_paths = glob_array ${TAURI_BACKEND_SERVICE_PATH}/classesif not array_is_empty ${protobuf_file_paths}echo Remove generated protobuf files:for path in ${protobuf_file_paths}@@ -59,10 +45,10 @@ script_runner = "@duckscript"[tasks.rm_tauri_generated_event_files]private = truescript = ["""- protobuf_file_paths = glob_array ${TAURI_PROTOBUF_PATH}/events- if not array_is_empty ${protobuf_file_paths}+ event_file_paths = glob_array ${TAURI_BACKEND_SERVICE_PATH}/events+ if not array_is_empty ${event_file_paths}echo Remove generated protobuf files:- for path in ${protobuf_file_paths}+ for path in ${event_file_paths}echo remove ${path}rm -rf ${path}end