Skip to content

Commit 430b8d5

Browse files
committed
added nape-portal project and upgrade all nape dependencies
1 parent 9e6fe45 commit 430b8d5

File tree

10 files changed

+90
-6
lines changed

10 files changed

+90
-6
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
# Other root-level ignore rules
33
# ...
4+
dist/
45
.idea/
56
debug/
67
target/

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[workspace]
22
resolver = "2"
33
members = [
4-
"apps/nape-cli",
4+
"apps/nape-cli", "apps/nape-portal",
55
"domain",
66
"kernel",
77
"test_framework/assertions",

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,15 @@ test-domain:
6060
test-kernel:
6161
@echo "\n\033[1;96m Running Tests - Kernel Package Only \033[0m\n"
6262
RUSTFLAGS="-A dead_code -A unused_imports" cargo test -p nape_kernel --lib -- --test-threads=8
63+
64+
65+
# Serve rule (generic)
66+
.PHONY: % serve
67+
% serve:
68+
@echo "Serving $(@: serve=)"
69+
$(MAKE) -C $(@: serve=) serve
70+
71+
.PHONY: % fmt
72+
% fmt:
73+
@echo "Serving $(@: fmt=)"
74+
$(MAKE) -C $(@: fmt=) fmt

apps/nape-cli/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ path = "src/main.rs"
1212
[dependencies]
1313
nape_domain = { path = "../../domain" }
1414
nape_kernel = { path = "../../kernel" }
15-
clap = { version = "4.5.16", features = ["derive", "cargo"] }
15+
clap = { version = "4.5.26", features = ["derive", "cargo"] }
1616
git2 = "0.18.3"
1717
reqwest = { version = "0.11.27", features = ["json"] }
18-
serde = { version = "1.0.209", features = ["derive"] }
19-
serde_json = "1.0.127"
18+
serde = { version = "1.0.217", features = ["derive"] }
19+
serde_json = "1.0.137"
2020
serde_yaml = "0.9.34"
2121
sha2 = "0.10.8"
2222
hex = "0.4.3"

apps/nape-portal/Cargo.toml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[package]
2+
name = "nape-portal"
3+
version = "0.1.0"
4+
edition = "2021"
5+
6+
[dependencies]
7+
console_error_panic_hook = "0.1.7"
8+
leptos = { version = "0.7.4", features = ["csr"] }
9+
leptos_router = { version = "0.7.4"}
10+
reactive_stores = "0.1.3"
11+
send_wrapper = { version = "0.6", features = ["futures"] }
12+
13+
[dev-dependencies]
14+
clippy = "*"
15+
16+
17+
[tool.clippy]
18+
deny = ["clippy::unwrap_used"]
19+
20+
[tool.clippy.overrides.tests]
21+
allow = ["clippy::unwrap_used"]

apps/nape-portal/Makefile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
.PHONY: build-release clean fmt serve update-deps upgrade-deps
2+
3+
build-release:
4+
trunk build --release
5+
6+
clean:
7+
trunk clean
8+
cago cleam
9+
10+
fmt:
11+
leptosfmt ./**/*.rs
12+
cargo clippy
13+
14+
serve:
15+
trunk serve
16+
17+
update-deps:
18+
cargo update --verbose
19+
20+
upgrade-deps:
21+
cargo upgrade --verbose

apps/nape-portal/index.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head> </head>
4+
5+
<body> </body>
6+
</html>

apps/nape-portal/src/app.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
use leptos::{component, view, IntoView};
2+
use leptos::prelude::ElementChild;
3+
4+
#[component]
5+
pub fn App() -> impl IntoView {
6+
7+
view! {
8+
<h1>NAPE Portal</h1>
9+
<p> Hello world, welcome to the NAPE Portal! </p>
10+
}
11+
12+
}

apps/nape-portal/src/main.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
use leptos::mount::mount_to_body;
2+
use crate::app::App;
3+
4+
mod app;
5+
6+
fn main() {
7+
#[cfg(debug_assertions)]
8+
console_error_panic_hook::set_once();
9+
10+
mount_to_body(App);
11+
}

kernel/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ edition = "2021"
66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77

88
[dependencies]
9-
url = "2.5.2"
10-
log = "0.4.22"
9+
url = "2.5.4"
10+
log = "0.4.25"
1111

1212
[dev-dependencies]
1313
nape_testing_tags = { path = "../test_framework/tags" }

0 commit comments

Comments
 (0)