diff --git a/Cargo.lock b/Cargo.lock index fec0d24..ad838f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1487,25 +1487,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -2101,9 +2082,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -3270,7 +3251,6 @@ version = "0.1.0" dependencies = [ "axum", "clego", - "include_dir", "tauri", "tauri-build", "tokio", diff --git a/Cargo.toml b/Cargo.toml index a55175c..8507ae3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" members = [ - "clego", - "tauri" + "crates/clego", + "crates/tauri" ] diff --git a/clego/.gitignore b/crates/clego/.gitignore similarity index 100% rename from clego/.gitignore rename to crates/clego/.gitignore diff --git a/clego/Cargo.toml b/crates/clego/Cargo.toml similarity index 100% rename from clego/Cargo.toml rename to crates/clego/Cargo.toml diff --git a/clego/assets/js/htmx.min.js.js b/crates/clego/assets/js/htmx.min.js.js similarity index 100% rename from clego/assets/js/htmx.min.js.js rename to crates/clego/assets/js/htmx.min.js.js diff --git a/clego/src/lib.rs b/crates/clego/src/lib.rs similarity index 100% rename from clego/src/lib.rs rename to crates/clego/src/lib.rs diff --git a/clego/src/main.rs b/crates/clego/src/main.rs similarity index 100% rename from clego/src/main.rs rename to crates/clego/src/main.rs diff --git a/clego/src/templates/hello.rs b/crates/clego/src/templates/hello.rs similarity index 100% rename from clego/src/templates/hello.rs rename to crates/clego/src/templates/hello.rs diff --git a/clego/src/templates/index.rs b/crates/clego/src/templates/index.rs similarity index 100% rename from clego/src/templates/index.rs rename to crates/clego/src/templates/index.rs diff --git a/clego/src/templates/mod.rs b/crates/clego/src/templates/mod.rs similarity index 100% rename from clego/src/templates/mod.rs rename to crates/clego/src/templates/mod.rs diff --git a/clego/templates/base.html b/crates/clego/templates/base.html similarity index 100% rename from clego/templates/base.html rename to crates/clego/templates/base.html diff --git a/clego/templates/hello.html b/crates/clego/templates/hello.html similarity index 100% rename from clego/templates/hello.html rename to crates/clego/templates/hello.html diff --git a/clego/templates/index.html b/crates/clego/templates/index.html similarity index 100% rename from clego/templates/index.html rename to crates/clego/templates/index.html diff --git a/tauri/.gitignore b/crates/tauri/.gitignore similarity index 100% rename from tauri/.gitignore rename to crates/tauri/.gitignore diff --git a/tauri/Cargo.toml b/crates/tauri/Cargo.toml similarity index 100% rename from tauri/Cargo.toml rename to crates/tauri/Cargo.toml diff --git a/tauri/build.rs b/crates/tauri/build.rs similarity index 100% rename from tauri/build.rs rename to crates/tauri/build.rs diff --git a/tauri/icons/128x128.png b/crates/tauri/icons/128x128.png similarity index 100% rename from tauri/icons/128x128.png rename to crates/tauri/icons/128x128.png diff --git a/tauri/icons/128x128@2x.png b/crates/tauri/icons/128x128@2x.png similarity index 100% rename from tauri/icons/128x128@2x.png rename to crates/tauri/icons/128x128@2x.png diff --git a/tauri/icons/32x32.png b/crates/tauri/icons/32x32.png similarity index 100% rename from tauri/icons/32x32.png rename to crates/tauri/icons/32x32.png diff --git a/tauri/icons/Square107x107Logo.png b/crates/tauri/icons/Square107x107Logo.png similarity index 100% rename from tauri/icons/Square107x107Logo.png rename to crates/tauri/icons/Square107x107Logo.png diff --git a/tauri/icons/Square142x142Logo.png b/crates/tauri/icons/Square142x142Logo.png similarity index 100% rename from tauri/icons/Square142x142Logo.png rename to crates/tauri/icons/Square142x142Logo.png diff --git a/tauri/icons/Square150x150Logo.png b/crates/tauri/icons/Square150x150Logo.png similarity index 100% rename from tauri/icons/Square150x150Logo.png rename to crates/tauri/icons/Square150x150Logo.png diff --git a/tauri/icons/Square284x284Logo.png b/crates/tauri/icons/Square284x284Logo.png similarity index 100% rename from tauri/icons/Square284x284Logo.png rename to crates/tauri/icons/Square284x284Logo.png diff --git a/tauri/icons/Square30x30Logo.png b/crates/tauri/icons/Square30x30Logo.png similarity index 100% rename from tauri/icons/Square30x30Logo.png rename to crates/tauri/icons/Square30x30Logo.png diff --git a/tauri/icons/Square310x310Logo.png b/crates/tauri/icons/Square310x310Logo.png similarity index 100% rename from tauri/icons/Square310x310Logo.png rename to crates/tauri/icons/Square310x310Logo.png diff --git a/tauri/icons/Square44x44Logo.png b/crates/tauri/icons/Square44x44Logo.png similarity index 100% rename from tauri/icons/Square44x44Logo.png rename to crates/tauri/icons/Square44x44Logo.png diff --git a/tauri/icons/Square71x71Logo.png b/crates/tauri/icons/Square71x71Logo.png similarity index 100% rename from tauri/icons/Square71x71Logo.png rename to crates/tauri/icons/Square71x71Logo.png diff --git a/tauri/icons/Square89x89Logo.png b/crates/tauri/icons/Square89x89Logo.png similarity index 100% rename from tauri/icons/Square89x89Logo.png rename to crates/tauri/icons/Square89x89Logo.png diff --git a/tauri/icons/StoreLogo.png b/crates/tauri/icons/StoreLogo.png similarity index 100% rename from tauri/icons/StoreLogo.png rename to crates/tauri/icons/StoreLogo.png diff --git a/tauri/icons/icon.icns b/crates/tauri/icons/icon.icns similarity index 100% rename from tauri/icons/icon.icns rename to crates/tauri/icons/icon.icns diff --git a/tauri/icons/icon.ico b/crates/tauri/icons/icon.ico similarity index 100% rename from tauri/icons/icon.ico rename to crates/tauri/icons/icon.ico diff --git a/tauri/icons/icon.png b/crates/tauri/icons/icon.png similarity index 100% rename from tauri/icons/icon.png rename to crates/tauri/icons/icon.png diff --git a/tauri/src/lib.rs b/crates/tauri/src/lib.rs similarity index 51% rename from tauri/src/lib.rs rename to crates/tauri/src/lib.rs index a621317..446fd28 100644 --- a/tauri/src/lib.rs +++ b/crates/tauri/src/lib.rs @@ -5,10 +5,37 @@ use tauri::{path::BaseDirectory, Manager}; use tokio::sync::Mutex; use tower::{Service, ServiceExt}; +async fn process_tauri_request(request: tauri::http::Request<>, router: axum:Router ){ +let (parts, body) = request.into_parts(); +let body = axum::body::Body::from(body); + +let request = axum::extract::Request::from_parts(parts, body); + +let response = match router.as_service().ready().await { + Ok(ready_service) => ready_service.call(request).await, + Err(_error) => panic!("Failed to get ready service"), +}; + +let response = match response { + Ok(response) => response, + Err(_error) => panic!("Problem getting response from request."), +}; + +let (parts, body) = response.into_parts(); +let body = match axum::body::to_bytes(body, usize::MAX).await { + Ok(bytes) => bytes.to_vec(), + Err(_error) => panic!("Problem converting response body to bytes."), +}; + +let response = tauri::http::Response::from_parts(parts, body); +} + #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() .setup(|app| { + // Create a router and adds it the the app state + let resource_path_buf = app .path() .resolve("assets", BaseDirectory::Resource) @@ -27,30 +54,6 @@ pub fn run() { tauri::async_runtime::spawn(async move { let mut router = router.lock().await; - - let (parts, body) = request.into_parts(); - let body = axum::body::Body::from(body); - - let request = axum::extract::Request::from_parts(parts, body); - - let response = match router.as_service().ready().await { - Ok(ready_service) => ready_service.call(request).await, - Err(_error) => panic!("Failed to get ready service"), - }; - - let response = match response { - Ok(response) => response, - Err(_error) => panic!("Problem getting response from request."), - }; - - let (parts, body) = response.into_parts(); - let body = match axum::body::to_bytes(body, usize::MAX).await { - Ok(bytes) => bytes.to_vec(), - Err(_error) => panic!("Problem converting response body to bytes."), - }; - - let response = tauri::http::Response::from_parts(parts, body); - responder.respond(response); }); }) diff --git a/tauri/src/main.rs b/crates/tauri/src/main.rs similarity index 100% rename from tauri/src/main.rs rename to crates/tauri/src/main.rs diff --git a/tauri/tauri.conf.json b/crates/tauri/tauri.conf.json similarity index 100% rename from tauri/tauri.conf.json rename to crates/tauri/tauri.conf.json