move to crates dir

unavi-xyz · Nov 27, 2023 · eb62ad4 · eb62ad4
1 parent 52010fd
commit eb62ad4
Show file tree

Hide file tree

Showing 54 changed files with 8 additions and 16 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "unavi-wired-api/wit"]
-	path = unavi-wired-api/wit
+	path = crates/unavi-wired-api/wit
 	url = [email protected]:unavi-xyz/wired-protocol-wit.git
 [submodule "unavi-ui/wit"]
-	path = unavi-ui/wit
+	path = crates/unavi-ui/wit
 	url = [email protected]:unavi-xyz/wired-protocol-wit.git
 [submodule "wired-protocol-proto/protos"]
-	path = wired-protocol-proto/protos
+	path = crates/wired-protocol-proto/protos
 	url = [email protected]:unavi-xyz/wired-protocol-proto.git
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,15 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
-  "unavi-app",
-  "unavi-native",
-  "unavi-server",
-  "unavi-system-api",
-  "unavi-ui",
-  "unavi-web/client",
-  "unavi-web/common",
-  "unavi-wired-api",
-  "wired-protocol-proto"
+  "crates/*"
 ]
 
 [workspace.package]
@@ -27,7 +19,7 @@ bin-package = "unavi-server"
 bin-default-features = true
 lib-package = "unavi-web-client"
 lib-profile-release = "wasm-release"
-style-file = "unavi-web/common/style.css"
+style-file = "crates/unavi-web-common/style.css"
 
 [profile.dev]
 opt-level = 1

diff --git a/unavi-app/Cargo.toml → crates/unavi-app/Cargo.toml b/unavi-app/Cargo.toml → crates/unavi-app/Cargo.toml
diff --git a/unavi-app/README.md → crates/unavi-app/README.md b/unavi-app/README.md → crates/unavi-app/README.md
diff --git a/unavi-app/examples/demo.rs → crates/unavi-app/examples/demo.rs b/unavi-app/examples/demo.rs → crates/unavi-app/examples/demo.rs
diff --git a/unavi-app/src/avatar.rs → crates/unavi-app/src/avatar.rs b/unavi-app/src/avatar.rs → crates/unavi-app/src/avatar.rs
diff --git a/unavi-app/src/lib.rs → crates/unavi-app/src/lib.rs b/unavi-app/src/lib.rs → crates/unavi-app/src/lib.rs
diff --git a/unavi-app/src/networking/mod.rs → crates/unavi-app/src/networking/mod.rs b/unavi-app/src/networking/mod.rs → crates/unavi-app/src/networking/mod.rs
diff --git a/unavi-app/src/player/controls.rs → crates/unavi-app/src/player/controls.rs b/unavi-app/src/player/controls.rs → crates/unavi-app/src/player/controls.rs
diff --git a/unavi-app/src/player/events.rs → crates/unavi-app/src/player/events.rs b/unavi-app/src/player/events.rs → crates/unavi-app/src/player/events.rs
diff --git a/unavi-app/src/player/input.rs → crates/unavi-app/src/player/input.rs b/unavi-app/src/player/input.rs → crates/unavi-app/src/player/input.rs
diff --git a/unavi-app/src/player/look.rs → crates/unavi-app/src/player/look.rs b/unavi-app/src/player/look.rs → crates/unavi-app/src/player/look.rs
diff --git a/unavi-app/src/player/mod.rs → crates/unavi-app/src/player/mod.rs b/unavi-app/src/player/mod.rs → crates/unavi-app/src/player/mod.rs
diff --git a/unavi-app/src/settings/mod.rs → crates/unavi-app/src/settings/mod.rs b/unavi-app/src/settings/mod.rs → crates/unavi-app/src/settings/mod.rs
diff --git a/unavi-app/src/settings/shadows.rs → crates/unavi-app/src/settings/shadows.rs b/unavi-app/src/settings/shadows.rs → crates/unavi-app/src/settings/shadows.rs
diff --git a/unavi-app/src/world/mod.rs → crates/unavi-app/src/world/mod.rs b/unavi-app/src/world/mod.rs → crates/unavi-app/src/world/mod.rs
diff --git a/unavi-app/src/world/skybox.rs → crates/unavi-app/src/world/skybox.rs b/unavi-app/src/world/skybox.rs → crates/unavi-app/src/world/skybox.rs
diff --git a/unavi-native/Cargo.toml → crates/unavi-native/Cargo.toml b/unavi-native/Cargo.toml → crates/unavi-native/Cargo.toml
diff --git a/unavi-native/README.md → crates/unavi-native/README.md b/unavi-native/README.md → crates/unavi-native/README.md
diff --git a/unavi-native/src/main.rs → crates/unavi-native/src/main.rs b/unavi-native/src/main.rs → crates/unavi-native/src/main.rs
diff --git a/unavi-server/Cargo.toml → crates/unavi-server/Cargo.toml b/unavi-server/Cargo.toml → crates/unavi-server/Cargo.toml
@@ -37,7 +37,7 @@ tracing-subscriber = "0.3.18"
 
 leptos = { version = "0.5.1", features = ["ssr"], optional = true }
 leptos_axum = { version = "0.5.1", optional = true }
-unavi-web-common= { path = "../unavi-web/common", features = ["ssr"], optional = true }
+unavi-web-common= { path = "../unavi-web-common", features = ["ssr"], optional = true }
 
 aeronet = { version = "0.3.0",  features = ["bevy"], optional = true }
 aeronet_wt_core = { version = "0.3.0", optional = true }

diff --git a/unavi-server/README.md → crates/unavi-server/README.md b/unavi-server/README.md → crates/unavi-server/README.md
diff --git a/unavi-server/examples/web_transport.rs → ...es/unavi-server/examples/web_transport.rs b/unavi-server/examples/web_transport.rs → ...es/unavi-server/examples/web_transport.rs
diff --git a/unavi-server/src/lib.rs → crates/unavi-server/src/lib.rs b/unavi-server/src/lib.rs → crates/unavi-server/src/lib.rs
diff --git a/unavi-server/src/main.rs → crates/unavi-server/src/main.rs b/unavi-server/src/main.rs → crates/unavi-server/src/main.rs
diff --git a/unavi-server/src/web/fileserve.rs → crates/unavi-server/src/web/fileserve.rs b/unavi-server/src/web/fileserve.rs → crates/unavi-server/src/web/fileserve.rs
diff --git a/unavi-server/src/web/mod.rs → crates/unavi-server/src/web/mod.rs b/unavi-server/src/web/mod.rs → crates/unavi-server/src/web/mod.rs
diff --git a/unavi-server/src/world/cert.rs → crates/unavi-server/src/world/cert.rs b/unavi-server/src/world/cert.rs → crates/unavi-server/src/world/cert.rs
diff --git a/unavi-server/src/world/mod.rs → crates/unavi-server/src/world/mod.rs b/unavi-server/src/world/mod.rs → crates/unavi-server/src/world/mod.rs
diff --git a/unavi-system-api/Cargo.toml → crates/unavi-system-api/Cargo.toml b/unavi-system-api/Cargo.toml → crates/unavi-system-api/Cargo.toml
diff --git a/unavi-system-api/README.md → crates/unavi-system-api/README.md b/unavi-system-api/README.md → crates/unavi-system-api/README.md
diff --git a/unavi-system-api/src/lib.rs → crates/unavi-system-api/src/lib.rs b/unavi-system-api/src/lib.rs → crates/unavi-system-api/src/lib.rs
diff --git a/unavi-ui/Cargo.toml → crates/unavi-ui/Cargo.toml b/unavi-ui/Cargo.toml → crates/unavi-ui/Cargo.toml
diff --git a/unavi-ui/README.md → crates/unavi-ui/README.md b/unavi-ui/README.md → crates/unavi-ui/README.md
diff --git a/unavi-ui/src/button.rs → crates/unavi-ui/src/button.rs b/unavi-ui/src/button.rs → crates/unavi-ui/src/button.rs
diff --git a/unavi-ui/src/lib.rs → crates/unavi-ui/src/lib.rs b/unavi-ui/src/lib.rs → crates/unavi-ui/src/lib.rs
diff --git a/unavi-ui/wit → crates/unavi-ui/wit b/unavi-ui/wit → crates/unavi-ui/wit
diff --git a/unavi-web/client/Cargo.toml → crates/unavi-web-client/Cargo.toml b/unavi-web/client/Cargo.toml → crates/unavi-web-client/Cargo.toml
@@ -13,6 +13,6 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 leptos = { version = "0.5.1", features = ["hydrate"] }
-unavi-web-common = { path = "../common", features = ["hydrate"] }
-unavi-app = { path = "../../unavi-app" }
+unavi-web-common = { path = "../unavi-web-common", features = ["hydrate"] }
+unavi-app = { path = "../unavi-app" }
 console_error_panic_hook = "0.1.7"
diff --git a/unavi-web/client/README.md → crates/unavi-web-client/README.md b/unavi-web/client/README.md → crates/unavi-web-client/README.md
diff --git a/unavi-web/client/src/lib.rs → crates/unavi-web-client/src/lib.rs b/unavi-web/client/src/lib.rs → crates/unavi-web-client/src/lib.rs
diff --git a/unavi-web/common/Cargo.toml → crates/unavi-web-common/Cargo.toml b/unavi-web/common/Cargo.toml → crates/unavi-web-common/Cargo.toml
diff --git a/unavi-web/common/README.md → crates/unavi-web-common/README.md b/unavi-web/common/README.md → crates/unavi-web-common/README.md
diff --git a/unavi-web/common/src/error_template.rs → ...es/unavi-web-common/src/error_template.rs b/unavi-web/common/src/error_template.rs → ...es/unavi-web-common/src/error_template.rs
diff --git a/unavi-web/common/src/lib.rs → crates/unavi-web-common/src/lib.rs b/unavi-web/common/src/lib.rs → crates/unavi-web-common/src/lib.rs
diff --git a/unavi-web/common/style.css → crates/unavi-web-common/style.css b/unavi-web/common/style.css → crates/unavi-web-common/style.css
diff --git a/unavi-wired-api/Cargo.toml → crates/unavi-wired-api/Cargo.toml b/unavi-wired-api/Cargo.toml → crates/unavi-wired-api/Cargo.toml
diff --git a/unavi-wired-api/README.md → crates/unavi-wired-api/README.md b/unavi-wired-api/README.md → crates/unavi-wired-api/README.md
diff --git a/unavi-wired-api/src/lib.rs → crates/unavi-wired-api/src/lib.rs b/unavi-wired-api/src/lib.rs → crates/unavi-wired-api/src/lib.rs
diff --git a/unavi-wired-api/wit → crates/unavi-wired-api/wit b/unavi-wired-api/wit → crates/unavi-wired-api/wit
diff --git a/wired-protocol-proto/Cargo.toml → crates/wired-protocol-proto/Cargo.toml b/wired-protocol-proto/Cargo.toml → crates/wired-protocol-proto/Cargo.toml
diff --git a/wired-protocol-proto/README.md → crates/wired-protocol-proto/README.md b/wired-protocol-proto/README.md → crates/wired-protocol-proto/README.md
diff --git a/wired-protocol-proto/build.rs → crates/wired-protocol-proto/build.rs b/wired-protocol-proto/build.rs → crates/wired-protocol-proto/build.rs
diff --git a/wired-protocol-proto/protos → crates/wired-protocol-proto/protos b/wired-protocol-proto/protos → crates/wired-protocol-proto/protos
diff --git a/wired-protocol-proto/src/lib.rs → crates/wired-protocol-proto/src/lib.rs b/wired-protocol-proto/src/lib.rs → crates/wired-protocol-proto/src/lib.rs