rob/mascarpone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hash statics

Browse source
This commit is contained in:
Robert Perce 2025-12-01 15:23:56 -06:00
parent a45bf45015
commit d925573629
12 changed files with 139 additions and 1464 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gitignore vendored
View file

@ -2,5 +2,8 @@
e2e/node_modules
e2e/playwright-report
e2e/test-results
some_user.db
dbs
/some_user.db
/dbs
/hashed_static
/users.db
/.sqlx

1461
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

6
Cargo.toml
View file

@ -9,6 +9,7 @@ axum = { version = "0.8.6", features = ["macros", "form"] }
axum-extra = { version = "0.10.3", features = ["form"] }
axum-htmx = "0.8.1"
axum-login = "0.18.0"
cache_bust = { version = "0.2.0", features = ["macro"] }
chrono = { version = "0.4.42", features = ["clock", "alloc"] }
clap = { version = "4.5.53", features = ["derive"] }
http = "1.3.1"
@ -35,6 +36,5 @@ tracing = "0.1.41"
tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
vcard = "0.4.13"
[dev-dependencies]
cargo-watch = "8.5.3"
systemfd = "0.4.6"
[build-dependencies]
cache_bust = "0.2.0"

23
Taskfile
View file

@ -16,18 +16,31 @@ refresh_sqlx_db() {
done
}
_env() {
refresh_sqlx_db > /dev/null
DATABASE_URL=sqlite:some_user.db \
CACHE_BUST_ASSETS_DIR=static \
"$@"
}
_cargo() {
_env cargo "$@"
}
edit() {
_env nvim
}
deploy_to_server() {
where="$1"
refresh_sqlx_db
env DATABASE_URL=sqlite:some_user.db cargo build --release
_cargo build --release
rsync -v -essh ./target/release/mascarpone "$where:~" \
&& rsync -rav -essh ./static "$where:~" \
&& rsync -rav -essh ./hashed_static "$where:~/static" \
&& ssh -t "$where" "sudo mv -f mascarpone /usr/bin/ && sudo rm -rf /var/local/mascarpone/static && sudo mv -f static /var/local/mascarpone/ && sudo systemctl restart mascarpone"
}
dev() {
refresh_sqlx_db > /dev/null
env DATABASE_URL=sqlite:some_user.db cargo run -- serve
_cargo run -- serve
}
"$@"

9
build.rs
View file

@ -1,3 +1,12 @@
use cache_bust::CacheBust;
fn main() {
println!("cargo:rerun-if-changed=migrations");
let cache_bust = CacheBust::builder()
.in_dir("static".to_owned())
.out_dir("hashed_static".to_owned())
.build();
cache_bust.hash_dir().expect("Cache busting failed");
}

2
mise.toml
View file

@ -1,6 +1,4 @@
[tools]
"cargo:systemfd" = "latest"
"watchexec" = "latest"
"rust-analyzer" = "latest"
"jj" = "latest"
"pnpm" = "latest"

13
src/main.rs
View file

@ -182,19 +182,12 @@ async fn serve(port: &u32) -> Result<(), anyhow::Error> {
.route_layer(login_required!(Backend, login_url = "/login"))
.merge(auth::router())
.merge(ics::router())
.nest_service("/static", ServeDir::new("./static"))
.nest_service("/static", ServeDir::new("./hashed_static"))
.layer(auth_layer)
.with_state(state);
let mut listenfd = listenfd::ListenFd::from_env();
let listener = match listenfd.take_tcp_listener(0)? {
Some(listener) => {
listener.set_nonblocking(true)?;
TcpListener::from_std(listener)
}
None => TcpListener::bind(format!("0.0.0.0:{}", port)).await,
}?;
tracing::debug!("Starting axum on 0.0.0.0:3000...");
let listener = TcpListener::bind(format!("0.0.0.0:{}", port)).await?;
tracing::debug!("Starting axum on 0.0.0.0:{}...", port);
axum::serve(listener, app)
.with_graceful_shutdown(shutdown_signal(deletion_task.abort_handle()))
.await

5
src/web/auth.rs
View file

@ -6,6 +6,7 @@ use axum::{
response::{IntoResponse, Redirect},
routing::{get, post},
};
use cache_bust::asset;
use maud::{DOCTYPE, html};
use serde::Deserialize;
@ -78,8 +79,8 @@ mod get {
script src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.7/dist/htmx.min.js" {}
script src="https://cdn.jsdelivr.net/npm/htmx-ext-response-targets@2.0.4" integrity="sha384-T41oglUPvXLGBVyRdZsVRxNWnOOqCynaPubjUVjxhsjFTKrFJGEMm3/0KGmNQ+Pg" crossorigin="anonymous" {}
script src="https://cdn.jsdelivr.net/npm/alpinejs@3.15.0/dist/cdn.min.js" defer {}
link rel="stylesheet" type="text/css" href="/static/index.css";
link rel="stylesheet" type="text/css" href="/static/login.css";
link rel="stylesheet" type="text/css" href=(format!("/static/{}", asset!("index.css")));
link rel="stylesheet" type="text/css" href=(format!("/static/{}", asset!("login.css")));
title { "Mascarpone" }
}
body hx-ext="response-targets" {

5
src/web/contact.rs
View file

@ -6,6 +6,7 @@ use axum::{
routing::{delete, get, post, put},
};
use axum_extra::extract::Form;
use cache_bust::asset;
use chrono::DateTime;
use maud::{Markup, PreEscaped, html};
use serde::Deserialize;
@ -100,7 +101,7 @@ mod get {
.text_body;
Ok(layout.render(
Some(vec!["/static/contact.css", "/static/journal.css"]),
Some(vec![asset!("contact.css"), asset!("journal.css")]),
html! {
a href=(format!("/contact/{}/edit", contact_id)) { "Edit" }
@ -210,7 +211,7 @@ mod get {
.text_body
.unwrap_or(String::new());
Ok(layout.render(Some(vec!["/static/contact.css"]), html! {
Ok(layout.render(Some(vec![asset!("contact.css")]), html! {
form hx-ext="response-targets" {
div {
input type="button" value="Save" hx-put=(cid_url) hx-target-error="#error";

3
src/web/home.rs
View file

@ -1,5 +1,6 @@
use axum::extract::State;
use axum::response::IntoResponse;
use cache_bust::asset;
use chrono::{Local, NaiveDate, TimeDelta};
use maud::{Markup, html};
use sqlx::sqlite::SqlitePool;
@ -230,7 +231,7 @@ pub mod get {
.fetch_all(pool)
.await?;
Ok(layout.render(
Some(vec!["/static/home.css", "/static/journal.css"]),
Some(vec![asset!("home.css"), asset!("journal.css")]),
html! {
(freshness_section(&freshens)?)
(birthdays_section(&prev_birthdays, &upcoming_birthdays)?)

6
src/web/mod.rs
View file

@ -1,6 +1,6 @@
use axum::RequestPartsExt;
use axum::extract::FromRequestParts;
// use axum::response::{IntoResponse, Redirect};
use cache_bust::asset;
use http::request::Parts;
use maud::{DOCTYPE, Markup, html};
use sqlx::FromRow;
@ -62,14 +62,14 @@ impl Layout {
(DOCTYPE)
html {
head {
link rel="stylesheet" type="text/css" href="/static/index.css";
link rel="stylesheet" type="text/css" href=(format!("/static/{}", asset!("index.css")));
meta name="viewport" content="width=device-width";
script src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.7/dist/htmx.min.js" {}
script src="https://cdn.jsdelivr.net/npm/htmx-ext-response-targets@2.0.4" integrity="sha384-T41oglUPvXLGBVyRdZsVRxNWnOOqCynaPubjUVjxhsjFTKrFJGEMm3/0KGmNQ+Pg" crossorigin="anonymous" {}
script src="https://cdn.jsdelivr.net/npm/alpinejs@3.15.0/dist/cdn.min.js" defer {}
@if let Some(hrefs) = css {
@for href in hrefs {
link rel="stylesheet" type="text/css" href=(href);
link rel="stylesheet" type="text/css" href=(format!("/static/{}", href));
}
}
}

3
src/web/settings.rs
View file

@ -4,6 +4,7 @@ use axum::{
routing::{delete, get, post, put},
};
use axum_extra::extract::Form;
use cache_bust::asset;
use maud::{Markup, html};
use serde::Deserialize;
use serde_json::json;
@ -61,7 +62,7 @@ mod get {
let ics_path: Option<String> = ics_path.0;
Ok(layout.render(
Some(vec!["static/settings.css"]),
Some(vec![asset!("settings.css")]),
html! {
h2 { "Birthdays Calendar URL" }
(calendar_link(ics_path))