insects/beacon
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

move to maud for templating

Browse source
This commit is contained in:
insects 2025-02-04 14:40:55 +01:00
parent 5dc1b3d1ff
commit 3584ecce96
7 changed files with 116 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

223
Cargo.lock generated
View file

@ -116,17 +116,12 @@ version = "0.1.0"
dependencies = [
"anyhow",
"axum",
"minijinja",
"minijinja-autoreload",
"maud",
"serde",
"serde_json",
"tokio",
]
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.8.0"
@ -145,18 +140,6 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "filetime"
version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
dependencies = [
"cfg-if",
"libc",
"libredox",
"windows-sys 0.59.0",
]
[[package]]
name = "fnv"
version = "1.0.7"
@ -172,15 +155,6 @@ dependencies = [
"percent-encoding",
]
[[package]]
name = "fsevent-sys"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
dependencies = [
"libc",
]
[[package]]
name = "futures-channel"
version = "0.3.31"
@ -301,69 +275,18 @@ dependencies = [
"tower-service",
]
[[package]]
name = "inotify"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
dependencies = [
"bitflags 2.8.0",
"inotify-sys",
"libc",
]
[[package]]
name = "inotify-sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
dependencies = [
"libc",
]
[[package]]
name = "itoa"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
[[package]]
name = "kqueue"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
dependencies = [
"kqueue-sys",
"libc",
]
[[package]]
name = "kqueue-sys"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
dependencies = [
"bitflags 1.3.2",
"libc",
]
[[package]]
name = "libc"
version = "0.2.169"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]]
name = "libredox"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
"bitflags 2.8.0",
"libc",
"redox_syscall",
]
[[package]]
name = "lock_api"
version = "0.4.12"
@ -386,45 +309,42 @@ version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
[[package]]
name = "maud"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8156733e27020ea5c684db5beac5d1d611e1272ab17901a49466294b84fc217e"
dependencies = [
"axum-core",
"http",
"itoa",
"maud_macros",
]
[[package]]
name = "maud_macros"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7261b00f3952f617899bc012e3dbd56e4f0110a038175929fa5d18e5a19913ca"
dependencies = [
"proc-macro2",
"proc-macro2-diagnostics",
"quote",
"syn",
]
[[package]]
name = "memchr"
version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "memo-map"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38d1115007560874e373613744c6fba374c17688327a71c1476d1a5954cc857b"
[[package]]
name = "mime"
version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minijinja"
version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cff7b8df5e85e30b87c2b0b3f58ba3a87b68e133738bf512a7713769326dbca9"
dependencies = [
"memo-map",
"self_cell",
"serde",
]
[[package]]
name = "minijinja-autoreload"
version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6019b2e74e34b57c4e6bbaf056633432c1059403d5f9005bdc7789bce8987803"
dependencies = [
"minijinja",
"notify",
]
[[package]]
name = "miniz_oxide"
version = "0.8.3"
@ -441,36 +361,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
dependencies = [
"libc",
"log",
"wasi",
"windows-sys 0.52.0",
"windows-sys",
]
[[package]]
name = "notify"
version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
dependencies = [
"bitflags 2.8.0",
"filetime",
"fsevent-sys",
"inotify",
"kqueue",
"libc",
"log",
"mio",
"notify-types",
"walkdir",
"windows-sys 0.59.0",
]
[[package]]
name = "notify-types"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
[[package]]
name = "object"
version = "0.36.7"
@ -536,6 +430,18 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "proc-macro2-diagnostics"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
dependencies = [
"proc-macro2",
"quote",
"syn",
"version_check",
]
[[package]]
name = "quote"
version = "1.0.38"
@ -551,7 +457,7 @@ version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
dependencies = [
"bitflags 2.8.0",
"bitflags",
]
[[package]]
@ -572,27 +478,12 @@ version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
[[package]]
name = "same-file"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
dependencies = [
"winapi-util",
]
[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "self_cell"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
[[package]]
name = "serde"
version = "1.0.217"
@ -669,7 +560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
dependencies = [
"libc",
"windows-sys 0.52.0",
"windows-sys",
]
[[package]]
@ -704,7 +595,7 @@ dependencies = [
"signal-hook-registry",
"socket2",
"tokio-macros",
"windows-sys 0.52.0",
"windows-sys",
]
[[package]]
@ -773,14 +664,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
[[package]]
name = "walkdir"
version = "2.5.0"
name = "version_check"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
dependencies = [
"same-file",
"winapi-util",
]
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "wasi"
@ -788,15 +675,6 @@ version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "winapi-util"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [
"windows-sys 0.59.0",
]
[[package]]
name = "windows-sys"
version = "0.52.0"
@ -806,15 +684,6 @@ dependencies = [
"windows-targets",
]
[[package]]
name = "windows-sys"
version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
version = "0.52.6"

5
Cargo.toml
View file

@ -6,6 +6,7 @@ edition = "2021"
[dependencies]
anyhow = "1.0.95"
axum = { version = "0.8.1", features = ["macros"] }
minijinja = { version = "2.7.0", features = ["loader"] }
minijinja-autoreload = "2.7.0"
maud = { version = "0.27.0", features = ["axum"] }
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.138"
tokio = { version = "1.43.0", features = ["full"] }

4
convert-to-json.js
View file

@ -7,8 +7,8 @@ import { FISH_INFO } from "./fish_data.js";
import fs from "node:fs/promises";
const result = {
data: DATA,
fish: FISH_INFO,
db_data: DATA,
fish_entries: FISH_INFO,
};
const json = JSON.stringify(result);

2
data.json
View file

File diff suppressed because one or more lines are too long

47
src/data.rs Normal file
View file

@ -0,0 +1,47 @@
use std::collections::HashMap;
use serde::{Deserialize, Serialize};
const DATA: &'static str = include_str!("../data.json");
#[derive(Serialize, Deserialize, Debug)]
pub struct Data {
pub db_data: SubData,
pub fish_entries: Vec<FishMeta>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct SubData {
#[serde(alias = "FISH")]
pub fish: HashMap<u32, FishEntry>,
}
#[derive(Serialize, Deserialize, Debug)]
#[serde(rename_all(deserialize = "camelCase"))]
pub struct FishEntry {
#[serde(alias = "_id")]
pub id: u32,
pub start_hour: Option<f32>,
pub end_hour: Option<f32>,
pub location: Option<u32>,
}
#[derive(Serialize, Deserialize, Debug)]
pub struct Location {
pub id: u32,
pub name_en: String,
pub map_coords: (f32, f32, u32),
}
#[derive(Serialize, Deserialize, Debug)]
pub struct FishMeta {
pub id: u32,
pub name_en: String,
}
impl Data {
pub fn new() -> Self {
let json = serde_json::from_str(DATA).unwrap();
json
}
}

48
src/main.rs
View file

@ -1,17 +1,13 @@
use std::{env, path::PathBuf, sync::Arc};
use std::sync::Arc;
use axum::{
extract::State,
http::StatusCode,
response::{Html, IntoResponse},
routing::get,
Router,
};
use minijinja::{context, path_loader, Environment};
use minijinja_autoreload::AutoReloader;
use axum::{extract::State, http::StatusCode, response::IntoResponse, routing::get, Router};
use data::Data;
use maud::{html, Markup};
pub mod data;
pub struct AppState {
pub templates: AutoReloader,
pub data: Data,
}
pub struct AppError(anyhow::Error);
@ -36,32 +32,22 @@ where
}
#[axum::debug_handler]
async fn main_handler(state: State<Arc<AppState>>) -> Result<Html<String>, AppError> {
let templates = state.templates.acquire_env()?;
let template = templates.get_template("index.html")?;
let html = template.render(context! {})?;
Ok(Html(html))
async fn main_handler(state: State<Arc<AppState>>) -> Result<Markup, AppError> {
println!("{:?}", state.data.db_data.fish);
let values = state.data.db_data.fish.values();
Ok(html! {
h1 { "Hello!" }
@for fish in values {
li { (fish.id) }
}
})
}
#[tokio::main]
async fn main() {
let disable_autoreload = env::var("DISABLE_AUTORELOAD").as_deref() == Ok("1");
let reloader = AutoReloader::new(move |notifier| {
let template_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("templates");
let mut tmp = Environment::new();
tmp.set_loader(path_loader(&template_path));
notifier.set_fast_reload(true);
if !disable_autoreload {
notifier.watch_path(&template_path, true);
}
Ok(tmp)
});
let app = Router::new()
.route("/", get(main_handler))
.with_state(Arc::new(AppState {
templates: reloader,
}));
.with_state(Arc::new(AppState { data: Data::new() }));
let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
println!("Listening on http://localhost:3000!");
axum::serve(listener, app).await.unwrap();

1
templates/index.html
View file

@ -1 +0,0 @@
<h1>hi</h1>