Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add a view model to runtime. #70

Merged
merged 13 commits into from
Dec 23, 2022
15 changes: 12 additions & 3 deletions bins/Cargo.lock

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

1 change: 1 addition & 0 deletions bins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ opt-level = "z"

[workspace.dependencies]
ayaka-runtime = { path = "../utils/ayaka-runtime" }
ayaka-model = { path = "../utils/ayaka-model" }
tokio = { version = "1" }
clap = { version = "4.0" }
flexi_logger = { version = "0.24", default-features = false, features = ["colors"] }
2 changes: 1 addition & 1 deletion bins/ayaka-check/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async fn main() -> Result<()> {
}
}
let mut ctx = context.await?;
ctx.init_new();
ctx.set_start_context();
let loc = opts.locale.unwrap_or_else(Locale::current);
while let Some(raw_ctx) = ctx.next_run() {
let action = ctx.get_action(&loc, &raw_ctx)?;
Expand Down
3 changes: 1 addition & 2 deletions bins/ayaka-gui/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ edition = "2021"
tauri-build = { version = "1.0", features = [] }

[dependencies]
ayaka-runtime = { workspace = true }
ayaka-model = { workspace = true }
flexi_logger = { workspace = true }
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.2", features = ["cli", "window-all"] }
tauri-plugin-window-state = "0.1"
trylog = "0.3"
tryiterator = { git = "https://github.com/Pernosco/tryiterator.git" }
axum = { version = "0.6", default-features = false, features = ["http1", "tokio"] }
tower-http = { version = "0.3", features = ["cors"] }
Expand Down
2 changes: 1 addition & 1 deletion bins/ayaka-gui/src-tauri/src/asset_resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use axum::{
routing::get,
Router, Server,
};
use ayaka_runtime::{log, vfs::*};
use ayaka_model::{log, vfs::*};
use std::{
io::{Read, Result},
net::TcpListener,
Expand Down
Loading