diff --git a/.gitignore b/.gitignore index 663beac..5bb2a0f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Other root-level ignore rules # ... +dist/ .idea/ debug/ target/ diff --git a/Cargo.toml b/Cargo.toml index c7406cb..8625cfe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" members = [ - "apps/nape-cli", + "apps/nape-cli", "apps/nape-portal", "domain", "kernel", "test_framework/assertions", diff --git a/Makefile b/Makefile index 8893c45..772f2a2 100644 --- a/Makefile +++ b/Makefile @@ -60,3 +60,15 @@ test-domain: test-kernel: @echo "\n\033[1;96m Running Tests - Kernel Package Only \033[0m\n" RUSTFLAGS="-A dead_code -A unused_imports" cargo test -p nape_kernel --lib -- --test-threads=8 + + +# Serve rule (generic) +.PHONY: % serve +% serve: + @echo "Serving $(@: serve=)" + $(MAKE) -C $(@: serve=) serve + +.PHONY: % fmt +% fmt: + @echo "Serving $(@: fmt=)" + $(MAKE) -C $(@: fmt=) fmt \ No newline at end of file diff --git a/apps/nape-cli/Cargo.toml b/apps/nape-cli/Cargo.toml index 5e9b2b5..cfef093 100644 --- a/apps/nape-cli/Cargo.toml +++ b/apps/nape-cli/Cargo.toml @@ -12,11 +12,11 @@ path = "src/main.rs" [dependencies] nape_domain = { path = "../../domain" } nape_kernel = { path = "../../kernel" } -clap = { version = "4.5.16", features = ["derive", "cargo"] } +clap = { version = "4.5.26", features = ["derive", "cargo"] } git2 = "0.18.3" reqwest = { version = "0.11.27", features = ["json"] } -serde = { version = "1.0.209", features = ["derive"] } -serde_json = "1.0.127" +serde = { version = "1.0.217", features = ["derive"] } +serde_json = "1.0.137" serde_yaml = "0.9.34" sha2 = "0.10.8" hex = "0.4.3" diff --git a/apps/nape-portal/Cargo.toml b/apps/nape-portal/Cargo.toml new file mode 100644 index 0000000..a75f18c --- /dev/null +++ b/apps/nape-portal/Cargo.toml @@ -0,0 +1,21 @@ +[package] +name = "nape-portal" +version = "0.1.0" +edition = "2021" + +[dependencies] +console_error_panic_hook = "0.1.7" +leptos = { version = "0.7.4", features = ["csr"] } +leptos_router = { version = "0.7.4"} +reactive_stores = "0.1.3" +send_wrapper = { version = "0.6", features = ["futures"] } + +[dev-dependencies] +clippy = "*" + + +[tool.clippy] +deny = ["clippy::unwrap_used"] + +[tool.clippy.overrides.tests] +allow = ["clippy::unwrap_used"] diff --git a/apps/nape-portal/Makefile b/apps/nape-portal/Makefile new file mode 100644 index 0000000..6f2039c --- /dev/null +++ b/apps/nape-portal/Makefile @@ -0,0 +1,21 @@ +.PHONY: build-release clean fmt serve update-deps upgrade-deps + +build-release: + trunk build --release + +clean: + trunk clean + cago cleam + +fmt: + leptosfmt ./**/*.rs + cargo clippy + +serve: + trunk serve + +update-deps: + cargo update --verbose + +upgrade-deps: + cargo upgrade --verbose \ No newline at end of file diff --git a/apps/nape-portal/index.html b/apps/nape-portal/index.html new file mode 100644 index 0000000..a6ee03c --- /dev/null +++ b/apps/nape-portal/index.html @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/apps/nape-portal/src/app.rs b/apps/nape-portal/src/app.rs new file mode 100644 index 0000000..d442697 --- /dev/null +++ b/apps/nape-portal/src/app.rs @@ -0,0 +1,12 @@ +use leptos::{component, view, IntoView}; +use leptos::prelude::ElementChild; + +#[component] +pub fn App() -> impl IntoView { + + view! { +

NAPE Portal

+

Hello world, welcome to the NAPE Portal!

+ } + +} \ No newline at end of file diff --git a/apps/nape-portal/src/main.rs b/apps/nape-portal/src/main.rs new file mode 100644 index 0000000..ec02cfa --- /dev/null +++ b/apps/nape-portal/src/main.rs @@ -0,0 +1,11 @@ +use leptos::mount::mount_to_body; +use crate::app::App; + +mod app; + +fn main() { + #[cfg(debug_assertions)] + console_error_panic_hook::set_once(); + + mount_to_body(App); +} diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 974ece4..1465ff3 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -url = "2.5.2" -log = "0.4.22" +url = "2.5.4" +log = "0.4.25" [dev-dependencies] nape_testing_tags = { path = "../test_framework/tags" }