From 7d41fbb5198a39e13e35e04c29ed0be5465b9b98 Mon Sep 17 00:00:00 2001 From: theo Date: Wed, 24 Jul 2024 21:59:24 +0200 Subject: [PATCH] fix: change project naming, create dummy sesame-vitale project --- Cargo.lock | 50 ++++++++++-------- Cargo.toml | 5 +- crates/{clego => app}/.gitignore | 0 crates/{clego => app}/Cargo.toml | 2 +- .../{clego => app}/assets/js/htmx.min.js.js | 0 crates/{clego => app}/src/lib.rs | 0 crates/{clego => app}/src/main.rs | 2 +- crates/{clego => app}/src/templates/hello.rs | 0 crates/{clego => app}/src/templates/index.rs | 0 crates/{clego => app}/src/templates/mod.rs | 0 crates/{clego => app}/templates/base.html | 0 crates/{clego => app}/templates/hello.html | 0 crates/{clego => app}/templates/index.html | 0 crates/{tauri => desktop}/.gitignore | 0 crates/{tauri => desktop}/Cargo.toml | 4 +- crates/{tauri => desktop}/build.rs | 0 crates/{tauri => desktop}/icons/128x128.png | Bin .../{tauri => desktop}/icons/128x128@2x.png | Bin crates/{tauri => desktop}/icons/32x32.png | Bin .../icons/Square107x107Logo.png | Bin .../icons/Square142x142Logo.png | Bin .../icons/Square150x150Logo.png | Bin .../icons/Square284x284Logo.png | Bin .../icons/Square30x30Logo.png | Bin .../icons/Square310x310Logo.png | Bin .../icons/Square44x44Logo.png | Bin .../icons/Square71x71Logo.png | Bin .../icons/Square89x89Logo.png | Bin crates/{tauri => desktop}/icons/StoreLogo.png | Bin crates/{tauri => desktop}/icons/icon.icns | Bin crates/{tauri => desktop}/icons/icon.ico | Bin crates/{tauri => desktop}/icons/icon.png | Bin crates/{tauri => desktop}/src/lib.rs | 2 +- crates/{tauri => desktop}/src/main.rs | 0 crates/{tauri => desktop}/tauri.conf.json | 2 +- crates/sesame-vitale/Cargo.toml | 6 +++ crates/sesame-vitale/src/lib.rs | 14 +++++ 37 files changed, 56 insertions(+), 31 deletions(-) rename crates/{clego => app}/.gitignore (100%) rename crates/{clego => app}/Cargo.toml (94%) rename crates/{clego => app}/assets/js/htmx.min.js.js (100%) rename crates/{clego => app}/src/lib.rs (100%) rename crates/{clego => app}/src/main.rs (94%) rename crates/{clego => app}/src/templates/hello.rs (100%) rename crates/{clego => app}/src/templates/index.rs (100%) rename crates/{clego => app}/src/templates/mod.rs (100%) rename crates/{clego => app}/templates/base.html (100%) rename crates/{clego => app}/templates/hello.html (100%) rename crates/{clego => app}/templates/index.html (100%) rename crates/{tauri => desktop}/.gitignore (100%) rename crates/{tauri => desktop}/Cargo.toml (87%) rename crates/{tauri => desktop}/build.rs (100%) rename crates/{tauri => desktop}/icons/128x128.png (100%) rename crates/{tauri => desktop}/icons/128x128@2x.png (100%) rename crates/{tauri => desktop}/icons/32x32.png (100%) rename crates/{tauri => desktop}/icons/Square107x107Logo.png (100%) rename crates/{tauri => desktop}/icons/Square142x142Logo.png (100%) rename crates/{tauri => desktop}/icons/Square150x150Logo.png (100%) rename crates/{tauri => desktop}/icons/Square284x284Logo.png (100%) rename crates/{tauri => desktop}/icons/Square30x30Logo.png (100%) rename crates/{tauri => desktop}/icons/Square310x310Logo.png (100%) rename crates/{tauri => desktop}/icons/Square44x44Logo.png (100%) rename crates/{tauri => desktop}/icons/Square71x71Logo.png (100%) rename crates/{tauri => desktop}/icons/Square89x89Logo.png (100%) rename crates/{tauri => desktop}/icons/StoreLogo.png (100%) rename crates/{tauri => desktop}/icons/icon.icns (100%) rename crates/{tauri => desktop}/icons/icon.ico (100%) rename crates/{tauri => desktop}/icons/icon.png (100%) rename crates/{tauri => desktop}/src/lib.rs (96%) rename crates/{tauri => desktop}/src/main.rs (100%) rename crates/{tauri => desktop}/tauri.conf.json (94%) create mode 100644 crates/sesame-vitale/Cargo.toml create mode 100644 crates/sesame-vitale/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index d706ed2..4d5cf74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,6 +62,17 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +[[package]] +name = "app" +version = "0.1.0" +dependencies = [ + "askama", + "askama_axum", + "axum", + "tokio", + "tower-http", +] + [[package]] name = "askama" version = "0.12.1" @@ -460,17 +471,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "clego" -version = "0.1.0" -dependencies = [ - "askama", - "askama_axum", - "axum", - "tokio", - "tower-http", -] - [[package]] name = "cocoa" version = "0.25.0" @@ -695,6 +695,18 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "desktop" +version = "0.1.0" +dependencies = [ + "app", + "axum", + "tauri", + "tauri-build", + "tokio", + "tower", +] + [[package]] name = "digest" version = "0.10.7" @@ -2161,18 +2173,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pharmacie-desktop" -version = "0.1.0" -dependencies = [ - "axum", - "clego", - "tauri", - "tauri-build", - "tokio", - "tower", -] - [[package]] name = "phf" version = "0.8.0" @@ -2919,6 +2919,10 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "sesame-vitale" +version = "0.1.0" + [[package]] name = "sha2" version = "0.10.8" diff --git a/Cargo.toml b/Cargo.toml index 8507ae3..f3d66ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,7 @@ [workspace] resolver = "2" members = [ - "crates/clego", - "crates/tauri" + "crates/app", + "crates/sesame-vitale", + "crates/desktop" ] diff --git a/crates/clego/.gitignore b/crates/app/.gitignore similarity index 100% rename from crates/clego/.gitignore rename to crates/app/.gitignore diff --git a/crates/clego/Cargo.toml b/crates/app/Cargo.toml similarity index 94% rename from crates/clego/Cargo.toml rename to crates/app/Cargo.toml index f06528b..786b7b6 100644 --- a/crates/clego/Cargo.toml +++ b/crates/app/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "clego" +name = "app" version = "0.1.0" edition = "2021" diff --git a/crates/clego/assets/js/htmx.min.js.js b/crates/app/assets/js/htmx.min.js.js similarity index 100% rename from crates/clego/assets/js/htmx.min.js.js rename to crates/app/assets/js/htmx.min.js.js diff --git a/crates/clego/src/lib.rs b/crates/app/src/lib.rs similarity index 100% rename from crates/clego/src/lib.rs rename to crates/app/src/lib.rs diff --git a/crates/clego/src/main.rs b/crates/app/src/main.rs similarity index 94% rename from crates/clego/src/main.rs rename to crates/app/src/main.rs index 00b4fdf..6d2d784 100644 --- a/crates/clego/src/main.rs +++ b/crates/app/src/main.rs @@ -1,4 +1,4 @@ -use ::clego::get_router; +use ::app::get_router; use std::path::Path; use std::env; diff --git a/crates/clego/src/templates/hello.rs b/crates/app/src/templates/hello.rs similarity index 100% rename from crates/clego/src/templates/hello.rs rename to crates/app/src/templates/hello.rs diff --git a/crates/clego/src/templates/index.rs b/crates/app/src/templates/index.rs similarity index 100% rename from crates/clego/src/templates/index.rs rename to crates/app/src/templates/index.rs diff --git a/crates/clego/src/templates/mod.rs b/crates/app/src/templates/mod.rs similarity index 100% rename from crates/clego/src/templates/mod.rs rename to crates/app/src/templates/mod.rs diff --git a/crates/clego/templates/base.html b/crates/app/templates/base.html similarity index 100% rename from crates/clego/templates/base.html rename to crates/app/templates/base.html diff --git a/crates/clego/templates/hello.html b/crates/app/templates/hello.html similarity index 100% rename from crates/clego/templates/hello.html rename to crates/app/templates/hello.html diff --git a/crates/clego/templates/index.html b/crates/app/templates/index.html similarity index 100% rename from crates/clego/templates/index.html rename to crates/app/templates/index.html diff --git a/crates/tauri/.gitignore b/crates/desktop/.gitignore similarity index 100% rename from crates/tauri/.gitignore rename to crates/desktop/.gitignore diff --git a/crates/tauri/Cargo.toml b/crates/desktop/Cargo.toml similarity index 87% rename from crates/tauri/Cargo.toml rename to crates/desktop/Cargo.toml index a9d2832..351ff36 100644 --- a/crates/tauri/Cargo.toml +++ b/crates/desktop/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "pharmacie-desktop" +name = "desktop" version = "0.1.0" description = "Un logiciel de pharmacie libre et open-source." authors = ["p4pillon"] @@ -18,5 +18,5 @@ tauri = { version = "2.0.0-beta", features = [] } tower = "0.4.13" tokio = "1.39.1" -clego = { path = "../clego" } +app = { path = "../app" } diff --git a/crates/tauri/build.rs b/crates/desktop/build.rs similarity index 100% rename from crates/tauri/build.rs rename to crates/desktop/build.rs diff --git a/crates/tauri/icons/128x128.png b/crates/desktop/icons/128x128.png similarity index 100% rename from crates/tauri/icons/128x128.png rename to crates/desktop/icons/128x128.png diff --git a/crates/tauri/icons/128x128@2x.png b/crates/desktop/icons/128x128@2x.png similarity index 100% rename from crates/tauri/icons/128x128@2x.png rename to crates/desktop/icons/128x128@2x.png diff --git a/crates/tauri/icons/32x32.png b/crates/desktop/icons/32x32.png similarity index 100% rename from crates/tauri/icons/32x32.png rename to crates/desktop/icons/32x32.png diff --git a/crates/tauri/icons/Square107x107Logo.png b/crates/desktop/icons/Square107x107Logo.png similarity index 100% rename from crates/tauri/icons/Square107x107Logo.png rename to crates/desktop/icons/Square107x107Logo.png diff --git a/crates/tauri/icons/Square142x142Logo.png b/crates/desktop/icons/Square142x142Logo.png similarity index 100% rename from crates/tauri/icons/Square142x142Logo.png rename to crates/desktop/icons/Square142x142Logo.png diff --git a/crates/tauri/icons/Square150x150Logo.png b/crates/desktop/icons/Square150x150Logo.png similarity index 100% rename from crates/tauri/icons/Square150x150Logo.png rename to crates/desktop/icons/Square150x150Logo.png diff --git a/crates/tauri/icons/Square284x284Logo.png b/crates/desktop/icons/Square284x284Logo.png similarity index 100% rename from crates/tauri/icons/Square284x284Logo.png rename to crates/desktop/icons/Square284x284Logo.png diff --git a/crates/tauri/icons/Square30x30Logo.png b/crates/desktop/icons/Square30x30Logo.png similarity index 100% rename from crates/tauri/icons/Square30x30Logo.png rename to crates/desktop/icons/Square30x30Logo.png diff --git a/crates/tauri/icons/Square310x310Logo.png b/crates/desktop/icons/Square310x310Logo.png similarity index 100% rename from crates/tauri/icons/Square310x310Logo.png rename to crates/desktop/icons/Square310x310Logo.png diff --git a/crates/tauri/icons/Square44x44Logo.png b/crates/desktop/icons/Square44x44Logo.png similarity index 100% rename from crates/tauri/icons/Square44x44Logo.png rename to crates/desktop/icons/Square44x44Logo.png diff --git a/crates/tauri/icons/Square71x71Logo.png b/crates/desktop/icons/Square71x71Logo.png similarity index 100% rename from crates/tauri/icons/Square71x71Logo.png rename to crates/desktop/icons/Square71x71Logo.png diff --git a/crates/tauri/icons/Square89x89Logo.png b/crates/desktop/icons/Square89x89Logo.png similarity index 100% rename from crates/tauri/icons/Square89x89Logo.png rename to crates/desktop/icons/Square89x89Logo.png diff --git a/crates/tauri/icons/StoreLogo.png b/crates/desktop/icons/StoreLogo.png similarity index 100% rename from crates/tauri/icons/StoreLogo.png rename to crates/desktop/icons/StoreLogo.png diff --git a/crates/tauri/icons/icon.icns b/crates/desktop/icons/icon.icns similarity index 100% rename from crates/tauri/icons/icon.icns rename to crates/desktop/icons/icon.icns diff --git a/crates/tauri/icons/icon.ico b/crates/desktop/icons/icon.ico similarity index 100% rename from crates/tauri/icons/icon.ico rename to crates/desktop/icons/icon.ico diff --git a/crates/tauri/icons/icon.png b/crates/desktop/icons/icon.png similarity index 100% rename from crates/tauri/icons/icon.png rename to crates/desktop/icons/icon.png diff --git a/crates/tauri/src/lib.rs b/crates/desktop/src/lib.rs similarity index 96% rename from crates/tauri/src/lib.rs rename to crates/desktop/src/lib.rs index 19ca565..e7da8af 100644 --- a/crates/tauri/src/lib.rs +++ b/crates/desktop/src/lib.rs @@ -45,7 +45,7 @@ pub fn run() { .expect("Path should be resolvable"); let router = Arc::new(Mutex::new( - clego::get_router(resource_path_buf.as_path()).clone(), + app::get_router(resource_path_buf.as_path()).clone(), )); // Adds the router to the application state diff --git a/crates/tauri/src/main.rs b/crates/desktop/src/main.rs similarity index 100% rename from crates/tauri/src/main.rs rename to crates/desktop/src/main.rs diff --git a/crates/tauri/tauri.conf.json b/crates/desktop/tauri.conf.json similarity index 94% rename from crates/tauri/tauri.conf.json rename to crates/desktop/tauri.conf.json index 9282f10..d971535 100644 --- a/crates/tauri/tauri.conf.json +++ b/crates/desktop/tauri.conf.json @@ -26,7 +26,7 @@ "bundle": { "active": true, "resources": { - "../clego/assets/": "./assets/" + "../app/assets/": "./assets/" }, "targets": "all", "icon": [ diff --git a/crates/sesame-vitale/Cargo.toml b/crates/sesame-vitale/Cargo.toml new file mode 100644 index 0000000..3dc98de --- /dev/null +++ b/crates/sesame-vitale/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "sesame-vitale" +version = "0.1.0" +edition = "2021" + +[dependencies] diff --git a/crates/sesame-vitale/src/lib.rs b/crates/sesame-vitale/src/lib.rs new file mode 100644 index 0000000..7d12d9a --- /dev/null +++ b/crates/sesame-vitale/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: usize, right: usize) -> usize { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +}