Skip to content

Commit

Permalink
update editor
Browse files Browse the repository at this point in the history
  • Loading branch information
DaiYuANg committed Jan 9, 2025
1 parent 4bb32de commit ea28ec3
Show file tree
Hide file tree
Showing 30 changed files with 1,619 additions and 734 deletions.
82 changes: 36 additions & 46 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ members = [

[workspace.dependencies]
serde = { version = "1", features = ["derive"] }
git2 = { version = "0.19.0", features = ["default"] }
git2 = { version = "0.20.0", features = ["default"] }
serde_json = { version = "1.0.133" }
sea-orm = { version = "1.1.3" }
shaku = { version = "0.6.2" }
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.4",
"concurrently": "catalog:",
"eslint": "^8.57.0",
"eslint": "^9.17.0",
"husky": "catalog:",
"lint-staged": "catalog:",
"markdownlint": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"mantine-contextmenu": "^7.15.1",
"react": "catalog:",
"react-dom": "catalog:",
"react-router": "^7.0.2",
"react-router": "catalog:",
"react-scan": "catalog:",
"recharts": "catalog:",
"zustand": "catalog:"
Expand Down
8 changes: 4 additions & 4 deletions packages/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ name = "desktop_lib"
crate-type = ["staticlib", "cdylib", "rlib"]

[build-dependencies]
tauri-build = { version = "2.0.3", features = ['tauri-codegen'] }
tauri-build = { version = "2.0.4", features = ['tauri-codegen'] }

[dependencies]
tauri = { version = "2.1.1", features = ['default','devtools','compression','tracing'] }
tauri-plugin-opener = "2.2.2"
tokio = { version = "1.42.0", features = ["default", "rt", "rt-multi-thread", "macros"] }
tauri = { version = "2.2.0", features = ['default','devtools','compression','tracing'] }
tauri-plugin-opener = "2.2.3"
tokio = { version = "1.43.0", features = ["default", "rt", "rt-multi-thread", "macros"] }
git2 = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = "1"
Expand Down
21 changes: 10 additions & 11 deletions packages/desktop/src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
"$schema": "../gen/schemas/desktop-schema.json",
"identifier": "default",
"description": "Capability for the main window",
"windows": ["desktop"],
"windows": ["main"],
"permissions": [
"core:default",
"opener:default",
"os:default",
"core:window:default",
"core:webview:default",
"core:window:allow-inner-position",
"core:app:default",
"core:event:default",
"core:image:default",
"core:menu:default",
"core:path:default",
"core:resources:default",
"core:tray:default"
"window:default",
"webview:default",
"app:default",
"event:default",
"image:default",
"menu:default",
"path:default",
"resources:default",
"tray:default"
],
"capabilities": [],
"webviews": []
Expand Down
27 changes: 1 addition & 26 deletions packages/desktop/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use tauri::menu::{Menu, MenuItem, PredefinedMenuItem, Submenu};

mod command;
mod git_service;
mod runtime;

module! {
MyModule {
Expand All @@ -25,32 +26,6 @@ pub fn run() {
.setup(|app| {
app.manage(module);
let platform = tauri_plugin_os::platform();
// let win_builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default())
// .title("Transparent Titlebar Window")
// .inner_size(1000.0, 800.0);
//
// #[cfg(target_os = "macos")]
// let win_builder = win_builder.title_bar_style(TitleBarStyle::Transparent);
//
// let window = win_builder.build().unwrap();
// set background color only when building for macOS
// #[cfg(target_os = "macos")]
// {
// use cocoa::appkit::{NSColor, NSWindow};
// use cocoa::base::{id, nil};
//
// let ns_window = window.ns_window().unwrap() as id;
// unsafe {
// let bg_color = NSColor::colorWithRed_green_blue_alpha_(
// nil,
// 50.0 / 255.0,
// 130.0 / 255.0,
// 163.5 / 255.0,
// 1.0,
// );
// ns_window.setBackgroundColor_(bg_color);
// }
// }
Ok(())
})
.menu(|handle| Menu::with_items(handle, &[
Expand Down
3 changes: 3 additions & 0 deletions packages/desktop/src-tauri/src/runtime.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn metadata(){
let version = env!("CARGO_PKG_VERSION");
}
Loading

0 comments on commit ea28ec3

Please sign in to comment.