From 2edb4f318717733df52d86a1f7ba7acbeecd88df Mon Sep 17 00:00:00 2001
From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com>
Date: Tue, 27 Jan 2026 15:12:20 -0700
Subject: [PATCH] Clean up some package stuff

---
 Cargo.lock                |  8 ++++----
 Cargo.toml                |  8 +++++++-
 src/lib.rs                |  2 +-
 unshell-crypt/Cargo.toml  |  1 -
 unshell-gui/Cargo.toml    | 13 +++++--------
 unshell-server/Cargo.toml |  1 -
 unshell-server/test.sh    | 20 --------------------
 7 files changed, 17 insertions(+), 36 deletions(-)
 delete mode 100755 unshell-server/test.sh

diff --git a/Cargo.lock b/Cargo.lock
index 30758d0..e2047ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3923,18 +3923,17 @@ checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unshell"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "chrono",
  "serde",
  "serde_json",
- "unshell-crypt",
  "unshell-obfuscate",
 ]
 
 [[package]]
 name = "unshell-crypt"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "aes",
  "block-padding 0.4.2",
@@ -3948,7 +3947,7 @@ dependencies = [
 
 [[package]]
 name = "unshell-gui"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "chrono",
  "eframe",
@@ -3956,6 +3955,7 @@ dependencies = [
  "egui-async",
  "egui_extras",
  "egui_tiles",
+ "log",
  "reqwest",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index 510c9d8..48a8985 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,9 +2,15 @@ cargo-features = ["trim-paths"]
 
 [package]
 name = "unshell"
+edition = "2024"
+
+[workspace.package]
 version = "0.1.0"
 edition = "2024"
 
+authors = ["ASTATIN3"]
+include = ["LICENSE-APACHE", "LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+
 [workspace]
 members = [
     # Binaries
@@ -28,7 +34,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 unshell-obfuscate = {path = "./unshell-obfuscate"}
-unshell-crypt = {path = "./unshell-crypt"}
+# unshell-crypt = {path = "./unshell-crypt"}
 
 [workspace.dependencies]
 ####
diff --git a/src/lib.rs b/src/lib.rs
index ed43c28..71d36ca 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,7 +11,7 @@ pub use error::{ModuleError, Result};
 pub use announcement::Announcement;
 
 // Re-exports
-pub use unshell_crypt;
+// pub use unshell_crypt;
 pub use unshell_obfuscate;
 
 // pub trait Component {
diff --git a/unshell-crypt/Cargo.toml b/unshell-crypt/Cargo.toml
index 0f0d989..ec4ccb5 100644
--- a/unshell-crypt/Cargo.toml
+++ b/unshell-crypt/Cargo.toml
@@ -1,6 +1,5 @@
 [package]
 name = "unshell-crypt"
-version = "0.1.0"
 edition = "2024"
 
 [dependencies]
diff --git a/unshell-gui/Cargo.toml b/unshell-gui/Cargo.toml
index 9a0ef7d..36f336e 100644
--- a/unshell-gui/Cargo.toml
+++ b/unshell-gui/Cargo.toml
@@ -1,12 +1,7 @@
 [package]
 name = "unshell-gui"
-version = "0.1.0"
 edition = "2024"
 
-authors = ["ASTATIN3"]
-include = ["LICENSE-APACHE", "LICENSE-MIT", "**/*.rs", "Cargo.toml"]
-rust-version = "1.88"
-
 [lib]
 crate-type = ["cdylib"]
 
@@ -18,7 +13,7 @@ targets = [
 ]
 
 [dependencies]
-unshell = {path="../"}
+unshell = { path="../" }
 
 # log = "0.4.27"
 chrono = { workspace = true }
@@ -26,6 +21,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 
 reqwest = {version = "0.12.26", features=["json"]}
+log = "0.4.29"
 
 # Stuff for app functionality
 egui = "0.33.0"
@@ -44,5 +40,6 @@ egui-async = "0.2.6"
 
 # Web Stuff
 wasm-bindgen-futures = "0.4.50"
-wasm-bindgen = "0.2.106"
-web-sys = {version = "0.3.70", features = ['Headers', 'Request', 'RequestInit', 'RequestMode', 'Response', 'Window']}
+wasm-bindgen = "0.2.108"
+# web-sys = "0.3.85"
+web-sys = { version = "0.3.85", features = ["Headers", "Request", "RequestInit", "RequestMode", "Response", "Window"] }
diff --git a/unshell-server/Cargo.toml b/unshell-server/Cargo.toml
index 00f2a12..bc5f328 100644
--- a/unshell-server/Cargo.toml
+++ b/unshell-server/Cargo.toml
@@ -1,6 +1,5 @@
 [package]
 name = "unshell-server"
-# version = "0.1.0"
 edition = "2024"
 
 [features]
diff --git a/unshell-server/test.sh b/unshell-server/test.sh
deleted file mode 100755
index 260f312..0000000
--- a/unshell-server/test.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-# curl -w '\n' \
-#     -H 'Content-Type: application/json' \
-#     -d '{"username":"foo","password":"bar"}' \
-#     http://localhost:3000/api/auth
-
-
-
-curl -s \
-     -w '\n' \
-     -H 'Content-Type: application/json' \
-     -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NjQ2NjU1ODMsImlhdCI6MTc2NDYyMjM4MywiZW1haWwiOiJmb28ifQ.NeStaGwWBGS825rF11TOH_e79RWEL_2o3SY9jZ5CX20' \
-     -d "jwbrjwbremnwebrnmwemnrbnmwerbnmwer" \
-     http://localhost:3000/api/test
-
-
-curl -s \
-     -w '\n' \
-     -H 'Content-Type: application/json' \
-     -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3NjQ2NjU1ODMsImlhdCI6MTc2NDYyMjM4MywiZW1haWwiOiJmb28ifQ.NeStaGwWBGS825rF11TOH_e79RWEL_2o3SY9jZ5CX20' \
-     http://localhost:3000/api/test/test2