Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
451baf8
Dummy menu
gschier Sep 20, 2024
8d9acdb
Merge branch 'master' into sync-system
gschier Sep 20, 2024
8e53ad0
Add SyncMenu back
gschier Sep 20, 2024
6b37174
Deterministic model hash and start on UI
gschier Sep 21, 2024
53a2182
Show sync items
gschier Sep 22, 2024
834da7a
Commit sync stuff
gschier Sep 22, 2024
fe252b4
More sync stuff
gschier Sep 22, 2024
ada1de8
Merge branch 'master' into sync-system
gschier Sep 23, 2024
f64da80
Checkpoint
gschier Sep 23, 2024
ed15b63
Merge branch 'master' into sync-system
gschier Sep 23, 2024
75535e0
Move some things
gschier Sep 23, 2024
86fc930
Merge branch 'master' into sync-system
gschier Sep 23, 2024
1e10746
UI for stage tree w/ toggles
gschier Sep 23, 2024
87e6cd3
Fix lint
gschier Sep 23, 2024
97126e3
Switch commit message to editor
gschier Sep 23, 2024
1136c3b
Clean up some more things
gschier Sep 23, 2024
09a7c88
Fix dialog scrolling
gschier Sep 23, 2024
93b8880
More space
gschier Sep 23, 2024
93c8f90
Merge branch 'master' into sync-system
gschier Sep 26, 2024
431595b
Tweaks after merge
gschier Sep 26, 2024
946a4d2
Merge branch 'master' into sync-system
gschier Sep 26, 2024
e2377e3
Put sync stuff in a real Tauri plugin
gschier Sep 26, 2024
5252ac6
Move hook into plugin
gschier Sep 26, 2024
b6f5996
Merge branch 'refs/heads/master' into sync-system
gschier Sep 27, 2024
567fd8f
Working PoC for creating commits and branches
gschier Sep 27, 2024
ed040fd
Generate
gschier Sep 27, 2024
5defe95
Fixed serialization
gschier Sep 27, 2024
785d8cc
Small tweaks
gschier Sep 28, 2024
8a6f305
Hide tree nodes that have no modified changes
gschier Sep 28, 2024
58440bc
More commit checks
gschier Sep 28, 2024
ebf3547
Build diff tree in Rust (not used yet)
gschier Sep 28, 2024
b377382
App now using Rust stage tree logic
gschier Sep 28, 2024
cf2a5ff
Merge branch 'master' into sync-system
gschier Sep 29, 2024
fe104b1
Show commit history
gschier Sep 29, 2024
7a34042
Generated
gschier Sep 29, 2024
4a1cc38
Add generated file
gschier Sep 29, 2024
568bec3
Merge branch 'master' into sync-system
gschier Sep 29, 2024
a1b4350
Merge branch 'master' into sync-system
gschier Sep 29, 2024
95fc98a
Merge branch 'master' into sync-system
gschier Oct 1, 2024
116d17f
Merge branch 'master' into sync-system
gschier Oct 1, 2024
8a1f0a9
Merge branch 'master' into sync-system
gschier Oct 14, 2024
1a6cdf0
Fix merge conflicts
gschier Oct 14, 2024
181babb
Disable autocomplete/correct/etc in plain input
gschier Oct 15, 2024
0ef5801
Disable autocomplete/correct/etc in plain input
gschier Oct 15, 2024
6731776
Merge remote-tracking branch 'origin/sync-system' into sync-system
gschier Oct 15, 2024
041fbc9
Merge branch 'master' into sync-system
gschier Oct 18, 2024
a884fd3
Merge master and fix commit dialog refresh
gschier Oct 18, 2024
0e8e612
Merge branch 'master' into sync-system
gschier Oct 18, 2024
3726025
Fix some merge stuff
gschier Oct 18, 2024
e6609c7
Merge branch 'master' into sync-system
gschier Oct 18, 2024
33b3610
Checkpoint
gschier Oct 21, 2024
feef141
Merge branch 'master' into sync-system
gschier Oct 28, 2024
fee9ae2
Tweaks
gschier Oct 29, 2024
daffffc
Merge branch 'refs/heads/master' into sync-system
gschier Oct 29, 2024
c70730a
Fix commit dialog children logic
gschier Oct 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"src-tauri/yaak_plugin_runtime",
"src-tauri/yaak_sync",
"src-tauri/yaak_templates",
"src-tauri/tauri-plugin-sync",
"src-tauri/yaak_sse",
"src-web"
],
Expand Down
1 change: 0 additions & 1 deletion rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
edition = "2018"

# Widths
chain_width = 100
Expand Down
68 changes: 52 additions & 16 deletions src-tauri/Cargo.lock

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

46 changes: 33 additions & 13 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
[workspace]
members = ["yaak_grpc", "yaak_templates", "yaak_plugin_runtime", "yaak_models", "yaak_sse"]
members = [
"tauri-plugin-sync",
"yaak_grpc",
"yaak_models",
"yaak_plugin_runtime",
"yaak_sse",
"yaak_templates",
]

[package]
name = "yaak-app"
Expand All @@ -23,30 +30,31 @@ objc = "0.2.7"
cocoa = "0.26.0"

[target.'cfg(target_os = "linux")'.dependencies]
openssl-sys = { version = "0.9", features = ["vendored"] } # For Ubuntu installation to work
openssl-sys = { version = "0.9", features = ["vendored"] } # For Linux installation to work

[dependencies]
yaak_grpc = { path = "yaak_grpc" }
yaak_templates = { path = "yaak_templates" }
yaak_plugin_runtime = { workspace = true }
yaak_models = { workspace = true }
yaak_sse = { path = "yaak_sse" }
anyhow = "1.0.86"
yaak_plugin_runtime = { workspace = true }
yaak_grpc = { workspace = true }
yaak_sse = { workspace = true }
yaak_templates = { workspace = true }
anyhow = "1.0.89"
base64 = "0.22.0"
chrono = { version = "0.4.31", features = ["serde"] }
chrono = { workspace = true, features = ["serde"] }
datetime = "0.5.2"
hex_color = "3.0.0"
http = "1"
log = "0.4.21"
rand = "0.8.5"
regex = "1.10.2"
reqwest = { version = "0.12.4", features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "native-tls-alpn"] }
reqwest = { version = "0.12.7", features = ["multipart", "cookies", "gzip", "brotli", "deflate", "json", "native-tls-alpn"] }
reqwest_cookie_store = "0.8.0"
serde = { version = "1.0.198", features = ["derive"] }
serde_json = { version = "1.0.116", features = ["raw_value"] }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true, features = ["raw_value"] }
serde_yaml = "0.9.34"
tauri = { workspace = true }
tauri = { workspace = true, features = ["devtools", "protocol-asset"] }
tauri-plugin-shell = { workspace = true }
tauri-plugin-sync = { workspace = true }
tauri-plugin-clipboard-manager = "2.0.1"
tauri-plugin-dialog = "2.0.3"
tauri-plugin-fs = "2.0.3"
Expand All @@ -57,13 +65,25 @@ tauri-plugin-window-state = "2.0.1"
tokio = { version = "1.36.0", features = ["sync"] }
tokio-stream = "0.1.15"
uuid = "1.7.0"
thiserror = "1.0.61"
thiserror = { workspace = true }
mime_guess = "2.0.5"
urlencoding = "2.1.3"
eventsource-client = { git = "https://github.com/yaakapp/rust-eventsource-client", version = "0.13.0" }

[workspace.dependencies]
yaak_models = { path = "yaak_models" }
yaak_grpc = { path = "yaak_grpc" }
yaak_sse = { path = "yaak_sse" }
yaak_templates = { path = "yaak_templates" }
yaak_plugin_runtime = { path = "yaak_plugin_runtime" }
tauri-plugin-sync = { path = "tauri-plugin-sync" }
chrono = "0.4.38"
rusqlite = "0.31.0"
serde = "1.0.210"
serde_json = "1.0.128"
sea-query = "0.31.0"
sea-query-rusqlite = "0.6.0"
tauri-plugin-shell = "2.0.2"
tauri = { version = "2.0.6", features = ["devtools", "protocol-asset"] }
thiserror = "1.0.64"
ts-rs = "10.0.0"
7 changes: 4 additions & 3 deletions src-tauri/capabilities/capabilities.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
}
]
},
"shell:allow-open",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text",
"core:webview:allow-set-webview-zoom",
"core:window:allow-close",
"core:window:allow-internal-toggle-maximize",
Expand All @@ -43,7 +44,7 @@
"core:window:allow-theme",
"core:window:allow-toggle-maximize",
"core:window:allow-unmaximize",
"clipboard-manager:allow-read-text",
"clipboard-manager:allow-write-text"
"shell:allow-open",
"sync:default"
]
}
2 changes: 1 addition & 1 deletion src-tauri/gen/schemas/acl-manifests.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-tauri/gen/schemas/capabilities.json

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

35 changes: 35 additions & 0 deletions src-tauri/gen/schemas/desktop-schema.json

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

35 changes: 35 additions & 0 deletions src-tauri/gen/schemas/macOS-schema.json

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

Loading