From 1f57b70cef8427daa352f523832a9c8f82f7b1fe Mon Sep 17 00:00:00 2001 From: "t.lettermann" Date: Wed, 24 Jul 2024 11:15:14 +0200 Subject: [PATCH] feat: move packages to root and remove unused dependencies --- Cargo.toml | 4 ++-- {crates/clego => clego}/.gitignore | 0 {crates/clego => clego}/Cargo.toml | 0 {crates/clego => clego}/assets/js/htmx.min.js.js | 0 {crates/clego => clego}/src/lib.rs | 0 {crates/clego => clego}/src/main.rs | 0 {crates/clego => clego}/src/templates/hello.rs | 0 {crates/clego => clego}/src/templates/index.rs | 0 {crates/clego => clego}/src/templates/mod.rs | 0 {crates/clego => clego}/templates/base.html | 0 {crates/clego => clego}/templates/hello.html | 0 {crates/clego => clego}/templates/index.html | 0 {crates/tauri => tauri}/.gitignore | 0 {crates/tauri => tauri}/Cargo.toml | 1 - {crates/tauri => tauri}/build.rs | 0 {crates/tauri => tauri}/icons/128x128.png | Bin {crates/tauri => tauri}/icons/128x128@2x.png | Bin {crates/tauri => tauri}/icons/32x32.png | Bin {crates/tauri => tauri}/icons/Square107x107Logo.png | Bin {crates/tauri => tauri}/icons/Square142x142Logo.png | Bin {crates/tauri => tauri}/icons/Square150x150Logo.png | Bin {crates/tauri => tauri}/icons/Square284x284Logo.png | Bin {crates/tauri => tauri}/icons/Square30x30Logo.png | Bin {crates/tauri => tauri}/icons/Square310x310Logo.png | Bin {crates/tauri => tauri}/icons/Square44x44Logo.png | Bin {crates/tauri => tauri}/icons/Square71x71Logo.png | Bin {crates/tauri => tauri}/icons/Square89x89Logo.png | Bin {crates/tauri => tauri}/icons/StoreLogo.png | Bin {crates/tauri => tauri}/icons/icon.icns | Bin {crates/tauri => tauri}/icons/icon.ico | Bin {crates/tauri => tauri}/icons/icon.png | Bin {crates/tauri => tauri}/src/lib.rs | 0 {crates/tauri => tauri}/src/main.rs | 0 {crates/tauri => tauri}/tauri.conf.json | 0 34 files changed, 2 insertions(+), 3 deletions(-) rename {crates/clego => clego}/.gitignore (100%) rename {crates/clego => clego}/Cargo.toml (100%) rename {crates/clego => clego}/assets/js/htmx.min.js.js (100%) rename {crates/clego => clego}/src/lib.rs (100%) rename {crates/clego => clego}/src/main.rs (100%) rename {crates/clego => clego}/src/templates/hello.rs (100%) rename {crates/clego => clego}/src/templates/index.rs (100%) rename {crates/clego => clego}/src/templates/mod.rs (100%) rename {crates/clego => clego}/templates/base.html (100%) rename {crates/clego => clego}/templates/hello.html (100%) rename {crates/clego => clego}/templates/index.html (100%) rename {crates/tauri => tauri}/.gitignore (100%) rename {crates/tauri => tauri}/Cargo.toml (95%) rename {crates/tauri => tauri}/build.rs (100%) rename {crates/tauri => tauri}/icons/128x128.png (100%) rename {crates/tauri => tauri}/icons/128x128@2x.png (100%) rename {crates/tauri => tauri}/icons/32x32.png (100%) rename {crates/tauri => tauri}/icons/Square107x107Logo.png (100%) rename {crates/tauri => tauri}/icons/Square142x142Logo.png (100%) rename {crates/tauri => tauri}/icons/Square150x150Logo.png (100%) rename {crates/tauri => tauri}/icons/Square284x284Logo.png (100%) rename {crates/tauri => tauri}/icons/Square30x30Logo.png (100%) rename {crates/tauri => tauri}/icons/Square310x310Logo.png (100%) rename {crates/tauri => tauri}/icons/Square44x44Logo.png (100%) rename {crates/tauri => tauri}/icons/Square71x71Logo.png (100%) rename {crates/tauri => tauri}/icons/Square89x89Logo.png (100%) rename {crates/tauri => tauri}/icons/StoreLogo.png (100%) rename {crates/tauri => tauri}/icons/icon.icns (100%) rename {crates/tauri => tauri}/icons/icon.ico (100%) rename {crates/tauri => tauri}/icons/icon.png (100%) rename {crates/tauri => tauri}/src/lib.rs (100%) rename {crates/tauri => tauri}/src/main.rs (100%) rename {crates/tauri => tauri}/tauri.conf.json (100%) diff --git a/Cargo.toml b/Cargo.toml index 8507ae3..a55175c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "2" members = [ - "crates/clego", - "crates/tauri" + "clego", + "tauri" ] diff --git a/crates/clego/.gitignore b/clego/.gitignore similarity index 100% rename from crates/clego/.gitignore rename to clego/.gitignore diff --git a/crates/clego/Cargo.toml b/clego/Cargo.toml similarity index 100% rename from crates/clego/Cargo.toml rename to clego/Cargo.toml diff --git a/crates/clego/assets/js/htmx.min.js.js b/clego/assets/js/htmx.min.js.js similarity index 100% rename from crates/clego/assets/js/htmx.min.js.js rename to clego/assets/js/htmx.min.js.js diff --git a/crates/clego/src/lib.rs b/clego/src/lib.rs similarity index 100% rename from crates/clego/src/lib.rs rename to clego/src/lib.rs diff --git a/crates/clego/src/main.rs b/clego/src/main.rs similarity index 100% rename from crates/clego/src/main.rs rename to clego/src/main.rs diff --git a/crates/clego/src/templates/hello.rs b/clego/src/templates/hello.rs similarity index 100% rename from crates/clego/src/templates/hello.rs rename to clego/src/templates/hello.rs diff --git a/crates/clego/src/templates/index.rs b/clego/src/templates/index.rs similarity index 100% rename from crates/clego/src/templates/index.rs rename to clego/src/templates/index.rs diff --git a/crates/clego/src/templates/mod.rs b/clego/src/templates/mod.rs similarity index 100% rename from crates/clego/src/templates/mod.rs rename to clego/src/templates/mod.rs diff --git a/crates/clego/templates/base.html b/clego/templates/base.html similarity index 100% rename from crates/clego/templates/base.html rename to clego/templates/base.html diff --git a/crates/clego/templates/hello.html b/clego/templates/hello.html similarity index 100% rename from crates/clego/templates/hello.html rename to clego/templates/hello.html diff --git a/crates/clego/templates/index.html b/clego/templates/index.html similarity index 100% rename from crates/clego/templates/index.html rename to clego/templates/index.html diff --git a/crates/tauri/.gitignore b/tauri/.gitignore similarity index 100% rename from crates/tauri/.gitignore rename to tauri/.gitignore diff --git a/crates/tauri/Cargo.toml b/tauri/Cargo.toml similarity index 95% rename from crates/tauri/Cargo.toml rename to tauri/Cargo.toml index 640a82a..6e32742 100644 --- a/crates/tauri/Cargo.toml +++ b/tauri/Cargo.toml @@ -18,6 +18,5 @@ tauri = { version = "2.0.0-beta", features = ["devtools"] } tower = "0.4.13" clego = { path = "../clego" } -include_dir = "0.7.4" tokio = "1.39.1" diff --git a/crates/tauri/build.rs b/tauri/build.rs similarity index 100% rename from crates/tauri/build.rs rename to tauri/build.rs diff --git a/crates/tauri/icons/128x128.png b/tauri/icons/128x128.png similarity index 100% rename from crates/tauri/icons/128x128.png rename to tauri/icons/128x128.png diff --git a/crates/tauri/icons/128x128@2x.png b/tauri/icons/128x128@2x.png similarity index 100% rename from crates/tauri/icons/128x128@2x.png rename to tauri/icons/128x128@2x.png diff --git a/crates/tauri/icons/32x32.png b/tauri/icons/32x32.png similarity index 100% rename from crates/tauri/icons/32x32.png rename to tauri/icons/32x32.png diff --git a/crates/tauri/icons/Square107x107Logo.png b/tauri/icons/Square107x107Logo.png similarity index 100% rename from crates/tauri/icons/Square107x107Logo.png rename to tauri/icons/Square107x107Logo.png diff --git a/crates/tauri/icons/Square142x142Logo.png b/tauri/icons/Square142x142Logo.png similarity index 100% rename from crates/tauri/icons/Square142x142Logo.png rename to tauri/icons/Square142x142Logo.png diff --git a/crates/tauri/icons/Square150x150Logo.png b/tauri/icons/Square150x150Logo.png similarity index 100% rename from crates/tauri/icons/Square150x150Logo.png rename to tauri/icons/Square150x150Logo.png diff --git a/crates/tauri/icons/Square284x284Logo.png b/tauri/icons/Square284x284Logo.png similarity index 100% rename from crates/tauri/icons/Square284x284Logo.png rename to tauri/icons/Square284x284Logo.png diff --git a/crates/tauri/icons/Square30x30Logo.png b/tauri/icons/Square30x30Logo.png similarity index 100% rename from crates/tauri/icons/Square30x30Logo.png rename to tauri/icons/Square30x30Logo.png diff --git a/crates/tauri/icons/Square310x310Logo.png b/tauri/icons/Square310x310Logo.png similarity index 100% rename from crates/tauri/icons/Square310x310Logo.png rename to tauri/icons/Square310x310Logo.png diff --git a/crates/tauri/icons/Square44x44Logo.png b/tauri/icons/Square44x44Logo.png similarity index 100% rename from crates/tauri/icons/Square44x44Logo.png rename to tauri/icons/Square44x44Logo.png diff --git a/crates/tauri/icons/Square71x71Logo.png b/tauri/icons/Square71x71Logo.png similarity index 100% rename from crates/tauri/icons/Square71x71Logo.png rename to tauri/icons/Square71x71Logo.png diff --git a/crates/tauri/icons/Square89x89Logo.png b/tauri/icons/Square89x89Logo.png similarity index 100% rename from crates/tauri/icons/Square89x89Logo.png rename to tauri/icons/Square89x89Logo.png diff --git a/crates/tauri/icons/StoreLogo.png b/tauri/icons/StoreLogo.png similarity index 100% rename from crates/tauri/icons/StoreLogo.png rename to tauri/icons/StoreLogo.png diff --git a/crates/tauri/icons/icon.icns b/tauri/icons/icon.icns similarity index 100% rename from crates/tauri/icons/icon.icns rename to tauri/icons/icon.icns diff --git a/crates/tauri/icons/icon.ico b/tauri/icons/icon.ico similarity index 100% rename from crates/tauri/icons/icon.ico rename to tauri/icons/icon.ico diff --git a/crates/tauri/icons/icon.png b/tauri/icons/icon.png similarity index 100% rename from crates/tauri/icons/icon.png rename to tauri/icons/icon.png diff --git a/crates/tauri/src/lib.rs b/tauri/src/lib.rs similarity index 100% rename from crates/tauri/src/lib.rs rename to tauri/src/lib.rs diff --git a/crates/tauri/src/main.rs b/tauri/src/main.rs similarity index 100% rename from crates/tauri/src/main.rs rename to tauri/src/main.rs diff --git a/crates/tauri/tauri.conf.json b/tauri/tauri.conf.json similarity index 100% rename from crates/tauri/tauri.conf.json rename to tauri/tauri.conf.json