feat: use single crate arch (#461)

- Uses single crate architecture
- Implements file server as a `handler` and leaves UI in its own crate
(non published to crates.io)

Author: LeoBorai

Cargo.lock

@@ -1,11 +1,7 @@
 [workspace]
 members = [
-    "crates/file-explorer",
-    "crates/file-explorer-plugin",
-    "crates/file-explorer-proto",
     "crates/file-explorer-ui",
     "crates/http-server",
-    "crates/http-server-plugin",
 ]
 default-members = ["crates/http-server"]
 resolver = "1"
@@ -50,9 +46,3 @@ tower-layer = "0.3.3"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 web-sys = "0.3.72"
-
-# Workspace Crates
-file-explorer = { path = "crates/file-explorer" }
-file-explorer-proto = { path = "crates/file-explorer-proto" }
-file-explorer-ui = { path = "crates/file-explorer-ui" }
-http-server-plugin = { path = "crates/http-server-plugin" }

Cargo.toml

@@ -3,17 +3,8 @@
 default:
 	@echo No default target.
 
-dev: ui-build plugin-build
-	cargo b --all && cargo r
-
-release: plugin-build
-	make -C ./crates/file-explorer-plugin release
-
-plugin-build: ui-release
-	make -C ./crates/file-explorer-plugin release
-
 ui-build:
-	make -C ./crates/file-explorer-ui build
+	make -C ./crates/file-explorer-ui release
 
 ui-dev:
 	@echo Starting File Explorer UI…

Makefile

@@ -23,11 +23,9 @@ leptos =  { workspace = true, features = ["csr"] }
 leptos_meta = { workspace = true, features = ["csr"] }
 leptos_router = { workspace = true, features = ["csr"] }
 reqwest = { workspace = true, features = ["json"] }
-rust-embed = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 web-sys = { workspace = true, features = ["FileList", "HtmlInputElement"] }
 
-file-explorer-proto = { workspace = true }
-
 [dev-dependencies]
 web-sys = { workspace = true }
 

crates/file-explorer-plugin/Cargo.toml

@@ -3,9 +3,6 @@
 default:
 	@echo No default target.
 
-build:
-	trunk build --locked --config ./Trunk.toml
-
 dev:
 	trunk serve --config ./Trunk.toml
 

crates/file-explorer-plugin/Makefile

@@ -1,9 +1,11 @@
+pub mod proto;
+
 use anyhow::Result;
 use gloo::utils::window;
 use reqwest::{header::CONTENT_TYPE, Url};
 use web_sys::FormData;
 
-use file_explorer_proto::DirectoryIndex;
+use self::proto::DirectoryIndex;
 
 pub struct FileDownload {
     pub bytes: Vec<u8>,

crates/file-explorer-proto/Cargo.toml

@@ -1,7 +1,6 @@
 use leptos::{component, view, For, IntoView, Signal, SignalGet};
 
-use file_explorer_proto::BreadcrumbItem;
-
+use crate::api::proto::BreadcrumbItem;
 use crate::components::atoms::icons::House;
 
 #[component]

crates/file-explorer-ui/Cargo.toml

@@ -3,8 +3,7 @@ use leptos::{
     component, create_memo, create_signal, spawn_local, view, IntoView, SignalGet, SignalSet,
 };
 
-use file_explorer_proto::DirectoryIndex;
-
+use crate::api::proto::DirectoryIndex;
 use crate::api::Api;
 use crate::components::organisms::action_bar::ActionBar;
 use crate::components::organisms::navigation_bar::NavigationBar;

crates/file-explorer-ui/Makefile

@@ -1,7 +1,7 @@
 use chrono::{DateTime, Local};
 use leptos::{component, view, IntoView, View};
 
-use file_explorer_proto::EntryType;
+use crate::api::proto::EntryType;
 
 use super::download_button::DownloadButton;
 use super::entry_icon::EntryIcon;

crates/file-explorer-ui/src/api.rs crates/file-explorer-ui/src/api/mod.rs

@@ -1,7 +1,6 @@
 use leptos::{component, view, IntoView};
 
-use file_explorer_proto::EntryType;
-
+use crate::api::proto::EntryType;
 use crate::components::atoms::icons::{File, Folder, Git, Justfile, Markdown, Rust, Toml};
 
 #[component]

crates/file-explorer-proto/src/lib.rs crates/file-explorer-ui/src/api/proto.rs

@@ -4,7 +4,7 @@ mod entry_icon;
 
 use leptos::{component, view, For, IntoView, Signal, SignalGet};
 
-use file_explorer_proto::DirectoryEntry;
+use crate::api::proto::DirectoryEntry;
 
 use self::entry::Entry;
 

crates/file-explorer-ui/src/components/organisms/navigation_bar.rs

@@ -3,13 +3,8 @@ mod components;
 
 use leptos::{component, view, IntoView};
 use leptos_meta::provide_meta_context;
-use rust_embed::Embed;
 
-use crate::components::pages::explorer::Explorer;
-
-#[derive(Embed)]
-#[folder = "public/dist"]
-pub struct Assets;
+use self::components::pages::explorer::Explorer;
 
 #[component]
 pub fn App() -> impl IntoView {

crates/file-explorer-ui/src/components/pages/explorer.rs

@@ -10,20 +10,13 @@ keywords = ["configurable", "http", "server", "serve", "static"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 
-[[bin]]
-name = "http-server"
-path = "src/bin/main.rs"
-
-[lib]
-name = "http_server_rs"
-path = "src/lib.rs"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 bytes = { workspace = true }
+chrono = { workspace = true, features = ["serde"] }
 clap = { workspace = true, features = ["env", "derive", "std"] }
 dirs = { workspace = true }
 http = { workspace = true }
@@ -32,11 +25,16 @@ hyper = { workspace = true }
 hyper-util = { workspace = true, features = ["full"] }
 libloading = { workspace = true }
 local-ip-address = { workspace = true }
+mime_guess = { workspace = true }
+multer = { workspace = true }
+rust-embed = { workspace = true }
+percent-encoding = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "signal", "macros"] }
+tokio-util = { workspace = true }
 tower-http = { workspace = true, features = ["cors"] }
 tower = { workspace = true, features = ["util"] }
 tower-layer = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
-
-http-server-plugin = { workspace = true }