Compare commits
6
Commits
v0.3.5
...
ff2f94e549
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff2f94e549 | ||
|
|
be954bc43e | ||
|
|
7fb0afcdc5 | ||
|
|
73efa6a4eb | ||
|
|
7a0724af7f | ||
|
|
0154f6c8c0 |
Generated
+20
-1
@@ -2948,7 +2948,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portal"
|
name = "portal"
|
||||||
version = "0.3.5"
|
version = "0.3.8"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
@@ -2970,6 +2970,7 @@ dependencies = [
|
|||||||
"leptos_router",
|
"leptos_router",
|
||||||
"openidconnect",
|
"openidconnect",
|
||||||
"proptest",
|
"proptest",
|
||||||
|
"pulldown-cmark",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_yaml",
|
"serde_yaml",
|
||||||
@@ -3104,6 +3105,24 @@ dependencies = [
|
|||||||
"unarray",
|
"unarray",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pulldown-cmark"
|
||||||
|
version = "0.13.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.13.1",
|
||||||
|
"memchr",
|
||||||
|
"pulldown-cmark-escape",
|
||||||
|
"unicase",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pulldown-cmark-escape"
|
||||||
|
version = "0.11.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-error"
|
name = "quick-error"
|
||||||
version = "1.2.3"
|
version = "1.2.3"
|
||||||
|
|||||||
+4
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "portal"
|
name = "portal"
|
||||||
version = "0.3.5"
|
version = "0.3.8"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
@@ -12,6 +12,9 @@ leptos_meta = { version = "0.8" }
|
|||||||
leptos_router = { version = "0.8" }
|
leptos_router = { version = "0.8" }
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
|
# Inline markdown for content descriptions (links, emphasis, code) -
|
||||||
|
# runs on both server and client renders, so not feature-gated.
|
||||||
|
pulldown-cmark = { version = "0.13", default-features = false, features = ["html"] }
|
||||||
|
|
||||||
# --- server only ---
|
# --- server only ---
|
||||||
leptos_axum = { version = "0.8", optional = true }
|
leptos_axum = { version = "0.8", optional = true }
|
||||||
|
|||||||
@@ -39,6 +39,13 @@ stream.
|
|||||||
`requires_chain` gates a page on verifiable answer provenance next
|
`requires_chain` gates a page on verifiable answer provenance next
|
||||||
to `qualifies`' Kanidm-group identity gate (see
|
to `qualifies`' Kanidm-group identity gate (see
|
||||||
`docs/design/filesystem-routes.md`).
|
`docs/design/filesystem-routes.md`).
|
||||||
|
- **Announced pages** (`src/announce.rs`): a question with an
|
||||||
|
`event: {starts, duration, place}` window is announced in the
|
||||||
|
header (not the footer nav) while the window is open, becomes a
|
||||||
|
followup when it closes, and its record in the runtime-owned
|
||||||
|
`portal_events` bucket moves to `awaiting_summary` - a "post what
|
||||||
|
happened" task any review desk can read, published on NATS like a
|
||||||
|
decision. A one-minute sweeper keeps it all idempotent.
|
||||||
- **State machines as content** (`src/aggregates/`): `aggregates.yaml`
|
- **State machines as content** (`src/aggregates/`): `aggregates.yaml`
|
||||||
declares each bucket's states and legal transitions; the engine
|
declares each bucket's states and legal transitions; the engine
|
||||||
replays a record's event history and refuses undeclared moves, with
|
replays a record's event history and refuses undeclared moves, with
|
||||||
|
|||||||
+147
@@ -0,0 +1,147 @@
|
|||||||
|
//! Announced pages (`Question.event`): keeps one `portal_events` record
|
||||||
|
//! per event question and, once a window closes, moves it to
|
||||||
|
//! `awaiting_summary` - the "post what happened" task - publishing the
|
||||||
|
//! transition on `portal.answers.submitted` like any desk decision, so
|
||||||
|
//! the desktop notifier and n8n hear it. Runs on a one-minute tick;
|
||||||
|
//! every step is idempotent, so a restart or a content reload in the
|
||||||
|
//! middle changes nothing.
|
||||||
|
|
||||||
|
use crate::answers::{store_answer, Answer};
|
||||||
|
use crate::content::EVENTS_BUCKET;
|
||||||
|
use crate::events::{emit_answer_submitted, AnswerSubmitted};
|
||||||
|
use crate::server::AppState;
|
||||||
|
|
||||||
|
/// Alternative name stamped on the auto-created record and on the
|
||||||
|
/// transition event - what an n8n workflow gates on.
|
||||||
|
pub const EVENT_ALTERNATIVE: &str = "Announced";
|
||||||
|
pub const SUMMARY_DUE_LABEL: &str = "Summary due";
|
||||||
|
|
||||||
|
/// Record id for an event question: its id with `/` folded to `-`
|
||||||
|
/// (`/events/opening` -> `events-opening`), so one page is one record
|
||||||
|
/// however many times the sweeper runs.
|
||||||
|
pub fn record_id(question_id: &str) -> String {
|
||||||
|
question_id.trim_matches('/').replace('/', "-")
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn run(state: AppState) {
|
||||||
|
let mut tick = tokio::time::interval(std::time::Duration::from_secs(60));
|
||||||
|
loop {
|
||||||
|
tick.tick().await;
|
||||||
|
if let Err(e) = sweep(&state).await {
|
||||||
|
tracing::warn!(error = %e, "event sweep failed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One pass: create missing records, close ended windows.
|
||||||
|
pub async fn sweep(state: &AppState) -> anyhow::Result<()> {
|
||||||
|
let now_ms = chrono::Utc::now().timestamp_millis();
|
||||||
|
let questions = state.questions.load();
|
||||||
|
let events: Vec<_> = questions.values().filter(|q| q.event.is_some()).cloned().collect();
|
||||||
|
if events.is_empty() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let aggregates = state.aggregates.load();
|
||||||
|
let schema = aggregates
|
||||||
|
.get(EVENTS_BUCKET)
|
||||||
|
.ok_or_else(|| anyhow::anyhow!("no {EVENTS_BUCKET} schema"))?;
|
||||||
|
let store = match state.jetstream.get_key_value(EVENTS_BUCKET).await {
|
||||||
|
Ok(store) => Some(store),
|
||||||
|
Err(_) => None,
|
||||||
|
};
|
||||||
|
|
||||||
|
for q in events {
|
||||||
|
let event = q.event.as_ref().expect("filtered");
|
||||||
|
let (starts, ends) = match event.window_ms() {
|
||||||
|
Ok(w) => w,
|
||||||
|
Err(_) => continue, // validated on load; belt and braces
|
||||||
|
};
|
||||||
|
let id = record_id(&q.id);
|
||||||
|
let existing: Option<Answer> = match &store {
|
||||||
|
Some(store) => store
|
||||||
|
.get(&id)
|
||||||
|
.await?
|
||||||
|
.and_then(|bytes| serde_json::from_slice(&bytes).ok()),
|
||||||
|
None => None,
|
||||||
|
};
|
||||||
|
let responses = serde_json::json!({
|
||||||
|
"name": q.name,
|
||||||
|
"starts": event.starts,
|
||||||
|
"starts_ms": starts,
|
||||||
|
"ends_ms": ends,
|
||||||
|
"place": event.place,
|
||||||
|
"page": q.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
let answer = match existing {
|
||||||
|
None => {
|
||||||
|
store_answer(
|
||||||
|
&state.jetstream,
|
||||||
|
&aggregates,
|
||||||
|
EVENTS_BUCKET,
|
||||||
|
id.clone(),
|
||||||
|
&q.id,
|
||||||
|
EVENT_ALTERNATIVE,
|
||||||
|
&responses,
|
||||||
|
now_ms,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
tracing::info!(question = %q.id, "event record created");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Some(a) => a,
|
||||||
|
};
|
||||||
|
|
||||||
|
if answer.state == schema.initial && now_ms >= ends {
|
||||||
|
let target = "awaiting_summary";
|
||||||
|
let payload = serde_json::json!({ "to": target, "item": id, "by": "portal" });
|
||||||
|
match crate::aggregates::transition(&state.jetstream, schema, &id, target, payload.clone(), now_ms).await {
|
||||||
|
Ok(_) => {}
|
||||||
|
Err(crate::aggregates::TransitionError::UnknownAggregate) => {
|
||||||
|
crate::aggregates::reseed(&state.jetstream, schema, &id, &answer.state, now_ms)
|
||||||
|
.await
|
||||||
|
.map_err(|e| anyhow::anyhow!("{e}"))?;
|
||||||
|
crate::aggregates::transition(&state.jetstream, schema, &id, target, payload.clone(), now_ms)
|
||||||
|
.await
|
||||||
|
.map_err(|e| anyhow::anyhow!("{e}"))?;
|
||||||
|
}
|
||||||
|
Err(e) => return Err(anyhow::anyhow!("{e}")),
|
||||||
|
}
|
||||||
|
let mut answer = answer;
|
||||||
|
answer.state = target.to_string();
|
||||||
|
answer.decided_ms = Some(now_ms);
|
||||||
|
answer.decided_by = Some("portal".to_string());
|
||||||
|
let store = state.jetstream.get_key_value(EVENTS_BUCKET).await?;
|
||||||
|
store.put(&id, serde_json::to_vec(&answer)?.into()).await?;
|
||||||
|
|
||||||
|
let parent_hashes = vec![id.clone()];
|
||||||
|
let chain_hash = crate::chain::hash_node(&q.id, &parent_hashes, &payload, now_ms);
|
||||||
|
emit_answer_submitted(
|
||||||
|
&state.nats,
|
||||||
|
&AnswerSubmitted {
|
||||||
|
chain_hash,
|
||||||
|
parent_hashes,
|
||||||
|
question_id: q.id.clone(),
|
||||||
|
alternative: SUMMARY_DUE_LABEL.to_string(),
|
||||||
|
responses: payload,
|
||||||
|
timestamp_ms: now_ms,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
tracing::info!(question = %q.id, "event ended - summary due");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::record_id;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn record_id_is_stable_and_flat() {
|
||||||
|
assert_eq!(record_id("/events/opening"), "events-opening");
|
||||||
|
assert_eq!(record_id("/"), "");
|
||||||
|
assert_eq!(record_id("/opening"), "opening");
|
||||||
|
}
|
||||||
|
}
|
||||||
+132
-6
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
use crate::answers::{Answer, SelfTransitionAnswer, TransitionAnswers, TransitionItem};
|
use crate::answers::{Answer, SelfTransitionAnswer, TransitionAnswers, TransitionItem};
|
||||||
use crate::auth::{current_user, User};
|
use crate::auth::{current_user, User};
|
||||||
use crate::content::{is_qualified, Alternative, Question, Responsible, SiteConfig, Transition};
|
use crate::content::{is_qualified, render_inline_markdown, Alternative, Question, Responsible, SiteConfig, Transition};
|
||||||
use crate::resource::{get_requirement_binding, get_requirement_options, get_resource};
|
use crate::resource::{get_requirement_binding, get_requirement_options, get_resource};
|
||||||
|
|
||||||
/// The visible site name/wordmark - "portal" is just this codebase's
|
/// The visible site name/wordmark - "portal" is just this codebase's
|
||||||
@@ -98,6 +98,21 @@ struct QuestionRes(Resource<Result<Option<Page>, ServerFnError>>);
|
|||||||
struct UserRes(Resource<Result<Option<User>, ServerFnError>>);
|
struct UserRes(Resource<Result<Option<User>, ServerFnError>>);
|
||||||
#[derive(Clone, Copy)]
|
#[derive(Clone, Copy)]
|
||||||
struct NavRes(Resource<Result<Vec<(String, String)>, ServerFnError>>);
|
struct NavRes(Resource<Result<Vec<(String, String)>, ServerFnError>>);
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
struct AnnounceRes(Resource<Result<Vec<Announcement>, ServerFnError>>);
|
||||||
|
|
||||||
|
/// One live announced page (`Question.event`), pre-formatted on the
|
||||||
|
/// server so both renders agree and no client clock is involved.
|
||||||
|
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct Announcement {
|
||||||
|
pub id: String,
|
||||||
|
pub name: String,
|
||||||
|
/// "Sat 12 Sep, 18:00"
|
||||||
|
pub when: String,
|
||||||
|
/// "in 3 days" / "in 4 h" / "now"
|
||||||
|
pub relative: String,
|
||||||
|
pub place: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
/// Owns the app's data resources, above the routes and reactive on the
|
/// Owns the app's data resources, above the routes and reactive on the
|
||||||
/// location instead of recreated per page. Route components creating
|
/// location instead of recreated per page. Route components creating
|
||||||
@@ -129,9 +144,11 @@ fn PortalShell() -> impl IntoView {
|
|||||||
);
|
);
|
||||||
let user = Resource::new(|| (), |_| current_user());
|
let user = Resource::new(|| (), |_| current_user());
|
||||||
let nav = Resource::new(move || chain.get().is_some(), list_qualifying_questions);
|
let nav = Resource::new(move || chain.get().is_some(), list_qualifying_questions);
|
||||||
|
let announcements = Resource::new(|| (), |_| list_announcements());
|
||||||
provide_context(QuestionRes(question));
|
provide_context(QuestionRes(question));
|
||||||
provide_context(UserRes(user));
|
provide_context(UserRes(user));
|
||||||
provide_context(NavRes(nav));
|
provide_context(NavRes(nav));
|
||||||
|
provide_context(AnnounceRes(announcements));
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<Routes fallback=|| view! { <NotFound/> }>
|
<Routes fallback=|| view! { <NotFound/> }>
|
||||||
@@ -219,6 +236,7 @@ fn QuestionView(
|
|||||||
title=question.name.clone()
|
title=question.name.clone()
|
||||||
description=question.description.clone()
|
description=question.description.clone()
|
||||||
landing=question_id == "/"
|
landing=question_id == "/"
|
||||||
|
current_id=question_id.clone()
|
||||||
site=site.clone()
|
site=site.clone()
|
||||||
/>
|
/>
|
||||||
<div class="alternatives">
|
<div class="alternatives">
|
||||||
@@ -245,6 +263,7 @@ fn QuestionView(
|
|||||||
title=question.name.clone()
|
title=question.name.clone()
|
||||||
description=question.description.clone()
|
description=question.description.clone()
|
||||||
landing=question_id == "/"
|
landing=question_id == "/"
|
||||||
|
current_id=question_id.clone()
|
||||||
site=site.clone()
|
site=site.clone()
|
||||||
/>
|
/>
|
||||||
<div class="alternatives">
|
<div class="alternatives">
|
||||||
@@ -284,6 +303,7 @@ fn QuestionView(
|
|||||||
description=question.description.clone()
|
description=question.description.clone()
|
||||||
landing=question_id == "/"
|
landing=question_id == "/"
|
||||||
site=site.clone()
|
site=site.clone()
|
||||||
|
current_id=question_id.clone()
|
||||||
/>
|
/>
|
||||||
<div class="alternatives">
|
<div class="alternatives">
|
||||||
<For
|
<For
|
||||||
@@ -367,6 +387,45 @@ fn QuestionNav(current_id: String, has_chain: bool) -> impl IntoView {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Live announced pages, as a strip at the top of the header - the one
|
||||||
|
/// place a page gets to claim attention before the question. Empty
|
||||||
|
/// (and unrendered) when nothing is announced.
|
||||||
|
#[component]
|
||||||
|
fn Announcements(current_id: String) -> impl IntoView {
|
||||||
|
let AnnounceRes(announcements) = expect_context();
|
||||||
|
view! {
|
||||||
|
<Suspense fallback=|| ()>
|
||||||
|
{move || {
|
||||||
|
let current_id = current_id.clone();
|
||||||
|
announcements.get().and_then(|res| res.ok()).map(|items| {
|
||||||
|
(!items.is_empty()).then(|| view! {
|
||||||
|
<nav class="announce" aria-label="Announcements">
|
||||||
|
<For
|
||||||
|
each=move || items.clone()
|
||||||
|
key=|a| a.id.clone()
|
||||||
|
children=move |a: Announcement| {
|
||||||
|
let current = a.id == current_id;
|
||||||
|
view! {
|
||||||
|
<a href=a.id.clone() class="announce-item" aria-current=current.then_some("page")>
|
||||||
|
<span class="announce-name">{a.name}</span>
|
||||||
|
<span class="announce-when">
|
||||||
|
{a.when}
|
||||||
|
{a.place.map(|p| format!(" · {p}"))}
|
||||||
|
</span>
|
||||||
|
<span class="announce-relative">{a.relative}</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
.into_any()
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</nav>
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
</Suspense>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// "Asked by X — contact them if you get stuck."
|
/// "Asked by X — contact them if you get stuck."
|
||||||
/// The mailto address is assembled from `data-user`/`data-domain` on a
|
/// The mailto address is assembled from `data-user`/`data-domain` on a
|
||||||
/// real mouse event, never baked into the server-rendered `href` -
|
/// real mouse event, never baked into the server-rendered `href` -
|
||||||
@@ -460,7 +519,7 @@ mod gesture {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
fn Hero(title: String, description: String, landing: bool, site: SiteConfig) -> impl IntoView {
|
fn Hero(title: String, description: String, landing: bool, site: SiteConfig, current_id: String) -> impl IntoView {
|
||||||
// Only the landing page gets a piece - it's the one page a hero is
|
// Only the landing page gets a piece - it's the one page a hero is
|
||||||
// actually "the" hero for; every other page gets the plain header.
|
// actually "the" hero for; every other page gets the plain header.
|
||||||
// WHAT the piece is belongs to the content repo: site.yaml's
|
// WHAT the piece is belongs to the content repo: site.yaml's
|
||||||
@@ -551,6 +610,7 @@ fn Hero(title: String, description: String, landing: bool, site: SiteConfig) ->
|
|||||||
|
|
||||||
view! {
|
view! {
|
||||||
<header class="hero" class:hero-module=has_module>
|
<header class="hero" class:hero-module=has_module>
|
||||||
|
<Announcements current_id=current_id/>
|
||||||
{has_module
|
{has_module
|
||||||
.then(|| {
|
.then(|| {
|
||||||
view! {
|
view! {
|
||||||
@@ -620,7 +680,7 @@ fn AlternativeCard(
|
|||||||
return view! {
|
return view! {
|
||||||
<section class="alt-card">
|
<section class="alt-card">
|
||||||
<h2>{alternative.name.clone()}</h2>
|
<h2>{alternative.name.clone()}</h2>
|
||||||
<p class="alt-description">{alternative.description.clone()}</p>
|
<p class="alt-description" inner_html=render_inline_markdown(&alternative.description)></p>
|
||||||
{move || {
|
{move || {
|
||||||
let question_id_for_action = question_id_for_action.clone();
|
let question_id_for_action = question_id_for_action.clone();
|
||||||
let alt_name_for_action = alt_name_for_action.clone();
|
let alt_name_for_action = alt_name_for_action.clone();
|
||||||
@@ -842,7 +902,7 @@ fn AlternativeCard(
|
|||||||
<section class="alt-card">
|
<section class="alt-card">
|
||||||
<AltImages images=alternative.images.clone() />
|
<AltImages images=alternative.images.clone() />
|
||||||
<h2>{alternative.name.clone()}</h2>
|
<h2>{alternative.name.clone()}</h2>
|
||||||
<p class="alt-description">{alternative.description.clone()}</p>
|
<p class="alt-description" inner_html=render_inline_markdown(&alternative.description)></p>
|
||||||
<div class="features">
|
<div class="features">
|
||||||
<For
|
<For
|
||||||
each={
|
each={
|
||||||
@@ -891,7 +951,7 @@ fn AlternativeCard(
|
|||||||
let description = feature.description.clone();
|
let description = feature.description.clone();
|
||||||
move || !description.is_empty()
|
move || !description.is_empty()
|
||||||
}>
|
}>
|
||||||
<p>{feature.description.clone()}</p>
|
<p inner_html=render_inline_markdown(&feature.description)></p>
|
||||||
</Show>
|
</Show>
|
||||||
{resource.map(|spec| {
|
{resource.map(|spec| {
|
||||||
view! {
|
view! {
|
||||||
@@ -1815,12 +1875,17 @@ pub async fn list_qualifying_questions(
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| ServerFnError::new(e.to_string()))?;
|
.map_err(|e| ServerFnError::new(e.to_string()))?;
|
||||||
|
|
||||||
|
let now_ms = chrono::Utc::now().timestamp_millis();
|
||||||
let mut out: Vec<(String, String)> = state
|
let mut out: Vec<(String, String)> = state
|
||||||
.questions
|
.questions
|
||||||
.load()
|
.load()
|
||||||
.values()
|
.values()
|
||||||
.filter(|q| is_qualified(user.as_ref(), q))
|
.filter(|q| is_qualified(user.as_ref(), q))
|
||||||
.filter(|q| !q.is_followup() || has_chain)
|
// An ended event page is a followup from then on - only a
|
||||||
|
// visitor carrying a chain (they answered it) still sees it.
|
||||||
|
.filter(|q| !(q.is_followup() || q.event_ended_at(now_ms)) || has_chain)
|
||||||
|
// A live event is announced in the header instead.
|
||||||
|
.filter(|q| !q.event_live_at(now_ms))
|
||||||
// A dynamic page has no URL of its own to link to.
|
// A dynamic page has no URL of its own to link to.
|
||||||
.filter(|q| !q.is_dynamic())
|
.filter(|q| !q.is_dynamic())
|
||||||
.map(|q| (q.id.clone(), q.name.clone()))
|
.map(|q| (q.id.clone(), q.name.clone()))
|
||||||
@@ -1829,6 +1894,67 @@ pub async fn list_qualifying_questions(
|
|||||||
Ok(out)
|
Ok(out)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Every announced page whose window is still open and that the
|
||||||
|
/// visitor qualifies for, soonest first.
|
||||||
|
#[server(endpoint = "list_announcements")]
|
||||||
|
pub async fn list_announcements() -> Result<Vec<Announcement>, ServerFnError> {
|
||||||
|
use crate::auth::{User, SESSION_USER_KEY};
|
||||||
|
use crate::content::is_qualified;
|
||||||
|
use crate::server::AppState;
|
||||||
|
|
||||||
|
let state = expect_context::<AppState>();
|
||||||
|
let session: tower_sessions::Session = leptos_axum::extract().await?;
|
||||||
|
let user = session
|
||||||
|
.get::<User>(SESSION_USER_KEY)
|
||||||
|
.await
|
||||||
|
.map_err(|e| ServerFnError::new(e.to_string()))?;
|
||||||
|
let now_ms = chrono::Utc::now().timestamp_millis();
|
||||||
|
|
||||||
|
let mut live: Vec<(i64, Announcement)> = state
|
||||||
|
.questions
|
||||||
|
.load()
|
||||||
|
.values()
|
||||||
|
.filter(|q| is_qualified(user.as_ref(), q) && q.event_live_at(now_ms))
|
||||||
|
.filter_map(|q| {
|
||||||
|
let event = q.event.as_ref()?;
|
||||||
|
let starts = chrono::DateTime::parse_from_rfc3339(&event.starts).ok()?;
|
||||||
|
let starts_ms = starts.timestamp_millis();
|
||||||
|
let relative = relative_until(starts_ms - now_ms);
|
||||||
|
Some((
|
||||||
|
starts_ms,
|
||||||
|
Announcement {
|
||||||
|
id: q.id.clone(),
|
||||||
|
name: q.name.clone(),
|
||||||
|
when: starts.format("%a %-d %b, %H:%M").to_string(),
|
||||||
|
relative,
|
||||||
|
place: event.place.clone(),
|
||||||
|
},
|
||||||
|
))
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
live.sort_by_key(|(starts, _)| *starts);
|
||||||
|
Ok(live.into_iter().map(|(_, a)| a).collect())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "in 3 days" / "in 4 h" / "in 20 min" / "now" (already started).
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
fn relative_until(delta_ms: i64) -> String {
|
||||||
|
const MIN: i64 = 60_000;
|
||||||
|
const HOUR: i64 = 60 * MIN;
|
||||||
|
const DAY: i64 = 24 * HOUR;
|
||||||
|
if delta_ms <= 0 {
|
||||||
|
"now".to_string()
|
||||||
|
} else if delta_ms >= 2 * DAY {
|
||||||
|
format!("in {} days", delta_ms / DAY)
|
||||||
|
} else if delta_ms >= DAY {
|
||||||
|
"tomorrow".to_string()
|
||||||
|
} else if delta_ms >= HOUR {
|
||||||
|
format!("in {} h", delta_ms / HOUR)
|
||||||
|
} else {
|
||||||
|
format!("in {} min", (delta_ms / MIN).max(1))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
pub struct SubmitResult {
|
pub struct SubmitResult {
|
||||||
pub next: Option<String>,
|
pub next: Option<String>,
|
||||||
|
|||||||
@@ -52,8 +52,21 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
eprintln!("FAIL: {e}");
|
eprintln!("FAIL: {e}");
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
|
let aggregates_map = content::with_builtin_aggregates(aggregates_map);
|
||||||
match content::validate_questions(&questions, &aggregates_map) {
|
match content::validate_questions(&questions, &aggregates_map) {
|
||||||
Ok(()) => {
|
Ok(()) => {
|
||||||
|
// The runtime's own event desk: a repo announcing pages
|
||||||
|
// (Question.event) should read portal_events somewhere, or
|
||||||
|
// "post what happened" tasks pile up unseen. Warn, don't
|
||||||
|
// fail - the runtime creates the records either way.
|
||||||
|
if questions.values().any(|q| q.event.is_some())
|
||||||
|
&& !content::bucket_is_read(&questions, content::EVENTS_BUCKET)
|
||||||
|
{
|
||||||
|
eprintln!(
|
||||||
|
"WARN: pages carry `event:` but no kv resource reads bucket {:?} - add a desk so summaries get posted",
|
||||||
|
content::EVENTS_BUCKET
|
||||||
|
);
|
||||||
|
}
|
||||||
println!(
|
println!(
|
||||||
"OK: {} question(s), {} aggregate(s) valid",
|
"OK: {} question(s), {} aggregate(s) valid",
|
||||||
questions.len(),
|
questions.len(),
|
||||||
|
|||||||
+256
-1
@@ -50,6 +50,59 @@ pub struct Question {
|
|||||||
/// (not a followup).
|
/// (not a followup).
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub followup: Option<bool>,
|
pub followup: Option<bool>,
|
||||||
|
/// This page announces something with a time window. While the
|
||||||
|
/// window is open the page is announced in the header (see
|
||||||
|
/// `app::Announcements`) instead of listed in the footer nav; once
|
||||||
|
/// it closes the page behaves like a `followup` (visible only to
|
||||||
|
/// visitors carrying an answer chain) and a "post what happened"
|
||||||
|
/// task lands in the `portal_events` desk (see `announce.rs`).
|
||||||
|
#[serde(default)]
|
||||||
|
pub event: Option<EventConfig>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A page's announcement window. `starts` is RFC 3339 with an offset
|
||||||
|
/// (`2026-09-12T18:00:00+02:00`); `duration` is a plain span like
|
||||||
|
/// `3h`, `90m`, `2d`, `1d 6h`. Optional `place` is shown verbatim.
|
||||||
|
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
|
||||||
|
pub struct EventConfig {
|
||||||
|
pub starts: String,
|
||||||
|
pub duration: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub place: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `3h`, `90m`, `2d`, `1d 6h 30m` -> milliseconds. Whole units only;
|
||||||
|
/// the smallest is a minute.
|
||||||
|
pub fn parse_duration_ms(text: &str) -> Result<i64, String> {
|
||||||
|
let mut total: i64 = 0;
|
||||||
|
let mut seen = false;
|
||||||
|
for token in text.split_whitespace() {
|
||||||
|
let (num, unit) = token.split_at(token.trim_end_matches(|c: char| c.is_ascii_alphabetic()).len());
|
||||||
|
let n: i64 = num.parse().map_err(|_| format!("bad duration {text:?}: {token:?}"))?;
|
||||||
|
let per = match unit {
|
||||||
|
"m" => 60_000,
|
||||||
|
"h" => 3_600_000,
|
||||||
|
"d" => 86_400_000,
|
||||||
|
_ => return Err(format!("bad duration {text:?}: unit {unit:?} (use m, h, d)")),
|
||||||
|
};
|
||||||
|
total += n * per;
|
||||||
|
seen = true;
|
||||||
|
}
|
||||||
|
if !seen || total <= 0 {
|
||||||
|
return Err(format!("bad duration {text:?}: must be positive"));
|
||||||
|
}
|
||||||
|
Ok(total)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
impl EventConfig {
|
||||||
|
/// `(starts_ms, ends_ms)` as Unix milliseconds.
|
||||||
|
pub fn window_ms(&self) -> Result<(i64, i64), String> {
|
||||||
|
let starts = chrono::DateTime::parse_from_rfc3339(&self.starts)
|
||||||
|
.map_err(|e| format!("bad starts {:?}: {e} (RFC 3339 with offset)", self.starts))?
|
||||||
|
.timestamp_millis();
|
||||||
|
Ok((starts, starts + parse_duration_ms(&self.duration)?))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Question {
|
impl Question {
|
||||||
@@ -57,6 +110,24 @@ impl Question {
|
|||||||
self.followup.unwrap_or(false)
|
self.followup.unwrap_or(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The announcement window is still open at `now_ms` (Unix ms).
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub fn event_live_at(&self, now_ms: i64) -> bool {
|
||||||
|
self.event
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|e| e.window_ms().ok())
|
||||||
|
.is_some_and(|(_, ends)| now_ms < ends)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The announcement window has closed at `now_ms`.
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub fn event_ended_at(&self, now_ms: i64) -> bool {
|
||||||
|
self.event
|
||||||
|
.as_ref()
|
||||||
|
.and_then(|e| e.window_ms().ok())
|
||||||
|
.is_some_and(|(_, ends)| now_ms >= ends)
|
||||||
|
}
|
||||||
|
|
||||||
/// A dynamic page - one whose id still contains a `[name]`
|
/// A dynamic page - one whose id still contains a `[name]`
|
||||||
/// segment. Served per-value via `resolve_question`, never listed
|
/// segment. Served per-value via `resolve_question`, never listed
|
||||||
/// in nav, never a valid `action` target.
|
/// in nav, never a valid `action` target.
|
||||||
@@ -65,6 +136,39 @@ impl Question {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Descriptions are inline markdown: `[text](https://…)` links,
|
||||||
|
/// `*emphasis*`, `**strong**`, `` `code` ``. Block structure is
|
||||||
|
/// flattened (a description is one paragraph) and raw HTML in the
|
||||||
|
/// source is dropped, so content can link out without being able to
|
||||||
|
/// inject markup. Link targets are limited to https, mailto and
|
||||||
|
/// site-relative paths; anything else renders as plain text.
|
||||||
|
pub fn render_inline_markdown(text: &str) -> String {
|
||||||
|
use pulldown_cmark::{html, Event, Options, Parser, Tag, TagEnd};
|
||||||
|
let parser = Parser::new_ext(text, Options::empty());
|
||||||
|
let mut in_link = 0usize;
|
||||||
|
let filtered = parser.filter_map(|event| match event {
|
||||||
|
Event::Html(_) | Event::InlineHtml(_) => None,
|
||||||
|
Event::Start(Tag::Paragraph) | Event::End(TagEnd::Paragraph) => None,
|
||||||
|
Event::SoftBreak => Some(Event::Text(" ".into())),
|
||||||
|
Event::Start(Tag::Link { dest_url, .. })
|
||||||
|
if !(dest_url.starts_with("https://")
|
||||||
|
|| dest_url.starts_with("mailto:")
|
||||||
|
|| dest_url.starts_with('/')) =>
|
||||||
|
{
|
||||||
|
in_link += 1;
|
||||||
|
None
|
||||||
|
}
|
||||||
|
Event::End(TagEnd::Link) if in_link > 0 => {
|
||||||
|
in_link -= 1;
|
||||||
|
None
|
||||||
|
}
|
||||||
|
other => Some(other),
|
||||||
|
});
|
||||||
|
let mut out = String::new();
|
||||||
|
html::push_html(&mut out, filtered);
|
||||||
|
out.trim().to_string()
|
||||||
|
}
|
||||||
|
|
||||||
/// Directory-scoped defaults: a `_section.yaml` file applies to every
|
/// Directory-scoped defaults: a `_section.yaml` file applies to every
|
||||||
/// question at or below its directory (nearest ancestor wins per
|
/// question at or below its directory (nearest ancestor wins per
|
||||||
/// field, and a question's own declaration always overrides). This is
|
/// field, and a question's own declaration always overrides). This is
|
||||||
@@ -871,12 +975,71 @@ pub async fn load_questions_from_gitea(
|
|||||||
/// standalone `question-lint` binary, so a YAML typo becomes a caught,
|
/// standalone `question-lint` binary, so a YAML typo becomes a caught,
|
||||||
/// logged rejection instead of a silently-accepted, later-broken
|
/// logged rejection instead of a silently-accepted, later-broken
|
||||||
/// string.
|
/// string.
|
||||||
|
/// Bucket the runtime keeps for announced pages (`Question.event`):
|
||||||
|
/// one record per event question, `announced` while the window is
|
||||||
|
/// open, `awaiting_summary` once it closes - the "post what happened"
|
||||||
|
/// task a desk reading this bucket picks up - and `summarized` when an
|
||||||
|
/// owner marks it done. Declared here, not in content, because the
|
||||||
|
/// runtime's sweeper (`announce.rs`) is what moves the records.
|
||||||
|
pub const EVENTS_BUCKET: &str = "portal_events";
|
||||||
|
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
const BUILTIN_AGGREGATES_YAML: &str = "\
|
||||||
|
aggregates:
|
||||||
|
- bucket: portal_events
|
||||||
|
initial: announced
|
||||||
|
states:
|
||||||
|
announced: { event: announced }
|
||||||
|
awaiting_summary: { event: ended }
|
||||||
|
summarized: { event: summarized }
|
||||||
|
transitions:
|
||||||
|
announced: [awaiting_summary, summarized]
|
||||||
|
awaiting_summary: [summarized]
|
||||||
|
";
|
||||||
|
|
||||||
|
/// Adds the runtime's own state graphs to a content repo's. Content
|
||||||
|
/// wins if it declares the same bucket (say, to add states).
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub fn with_builtin_aggregates(
|
||||||
|
mut aggregates: std::collections::HashMap<String, crate::aggregates::AggregateSchema>,
|
||||||
|
) -> std::collections::HashMap<String, crate::aggregates::AggregateSchema> {
|
||||||
|
let builtin = crate::aggregates::parse_aggregates_yaml(BUILTIN_AGGREGATES_YAML)
|
||||||
|
.expect("builtin aggregates yaml is valid");
|
||||||
|
for (bucket, schema) in builtin {
|
||||||
|
aggregates.entry(bucket).or_insert(schema);
|
||||||
|
}
|
||||||
|
aggregates
|
||||||
|
}
|
||||||
|
|
||||||
|
/// True when some kv resource in the content reads `bucket` - the
|
||||||
|
/// attended-bucket check, exposed so the lint can warn about the
|
||||||
|
/// runtime's own `portal_events` (a warning, not a failure: a repo
|
||||||
|
/// with no event pages has nothing to attend).
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub fn bucket_is_read(questions: &std::collections::HashMap<String, Question>, bucket: &str) -> bool {
|
||||||
|
questions.values().any(|q| {
|
||||||
|
q.alternatives.iter().any(|a| {
|
||||||
|
a.features
|
||||||
|
.iter()
|
||||||
|
.any(|f| f.resource.as_ref().and_then(|r| r.bucket()).is_some_and(|b| b == bucket))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "ssr")]
|
#[cfg(feature = "ssr")]
|
||||||
pub fn validate_questions(
|
pub fn validate_questions(
|
||||||
questions: &std::collections::HashMap<String, Question>,
|
questions: &std::collections::HashMap<String, Question>,
|
||||||
aggregates: &std::collections::HashMap<String, crate::aggregates::AggregateSchema>,
|
aggregates: &std::collections::HashMap<String, crate::aggregates::AggregateSchema>,
|
||||||
) -> anyhow::Result<()> {
|
) -> anyhow::Result<()> {
|
||||||
for question in questions.values() {
|
for question in questions.values() {
|
||||||
|
if let Some(event) = &question.event {
|
||||||
|
if question.is_dynamic() {
|
||||||
|
anyhow::bail!("question {:?}: a dynamic page can't carry an event", question.id);
|
||||||
|
}
|
||||||
|
if let Err(e) = event.window_ms() {
|
||||||
|
anyhow::bail!("question {:?}: event: {e}", question.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
if let Some(target) = &question.requires_chain {
|
if let Some(target) = &question.requires_chain {
|
||||||
if !questions.contains_key(target) {
|
if !questions.contains_key(target) {
|
||||||
anyhow::bail!(
|
anyhow::bail!(
|
||||||
@@ -1081,7 +1244,7 @@ pub async fn watch_for_reload(
|
|||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
while sub.next().await.is_some() {
|
while sub.next().await.is_some() {
|
||||||
let loaded_aggregates = match load_aggregates_from_gitea(&repo_url, &branch).await {
|
let loaded_aggregates = match load_aggregates_from_gitea(&repo_url, &branch).await {
|
||||||
Ok(loaded) => loaded,
|
Ok(loaded) => with_builtin_aggregates(loaded),
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
tracing::error!(error = %e, "aggregates.yaml reload failed, keeping last-good content");
|
tracing::error!(error = %e, "aggregates.yaml reload failed, keeping last-good content");
|
||||||
continue;
|
continue;
|
||||||
@@ -1695,4 +1858,96 @@ alternatives:
|
|||||||
let questions = build_questions(&files).unwrap();
|
let questions = build_questions(&files).unwrap();
|
||||||
assert!(validate_questions(&questions, &Default::default()).is_err());
|
assert!(validate_questions(&questions, &Default::default()).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── events (announced pages) ─────────────────────────────────────────
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn duration_parses_whole_units() {
|
||||||
|
assert_eq!(parse_duration_ms("3h").unwrap(), 3 * 3_600_000);
|
||||||
|
assert_eq!(parse_duration_ms("90m").unwrap(), 90 * 60_000);
|
||||||
|
assert_eq!(parse_duration_ms("1d 6h").unwrap(), 30 * 3_600_000);
|
||||||
|
assert!(parse_duration_ms("0h").is_err());
|
||||||
|
assert!(parse_duration_ms("3 hours").is_err());
|
||||||
|
assert!(parse_duration_ms("").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn event_window_and_liveness() {
|
||||||
|
let q: Question = serde_yaml::from_str(
|
||||||
|
"id: /opening\nname: Will you be there?\nevent:\n starts: 2026-09-12T18:00:00+02:00\n duration: 3h\n",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let (starts, ends) = q.event.as_ref().unwrap().window_ms().unwrap();
|
||||||
|
assert_eq!(ends - starts, 3 * 3_600_000);
|
||||||
|
assert!(q.event_live_at(starts - 1));
|
||||||
|
assert!(q.event_live_at(ends - 1));
|
||||||
|
assert!(!q.event_live_at(ends));
|
||||||
|
assert!(q.event_ended_at(ends));
|
||||||
|
assert!(!q.event_ended_at(starts));
|
||||||
|
let plain: Question = serde_yaml::from_str("id: /x\nname: X\n").unwrap();
|
||||||
|
assert!(!plain.event_live_at(0) && !plain.event_ended_at(i64::MAX));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn event_validation() {
|
||||||
|
let bad: Question = serde_yaml::from_str(
|
||||||
|
"id: /e\nname: E\nevent:\n starts: next friday\n duration: 3h\n",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let mut qs = std::collections::HashMap::new();
|
||||||
|
qs.insert(bad.id.clone(), bad);
|
||||||
|
let err = validate_questions(&qs, &Default::default()).unwrap_err().to_string();
|
||||||
|
assert!(err.contains("bad starts"), "{err}");
|
||||||
|
|
||||||
|
let dynamic: Question = serde_yaml::from_str(
|
||||||
|
"id: /e/[slot]\nname: E\nevent:\n starts: 2026-09-12T18:00:00Z\n duration: 3h\n",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let mut qs = std::collections::HashMap::new();
|
||||||
|
qs.insert(dynamic.id.clone(), dynamic);
|
||||||
|
let err = validate_questions(&qs, &Default::default()).unwrap_err().to_string();
|
||||||
|
assert!(err.contains("dynamic page can't carry an event"), "{err}");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn builtin_events_schema_yields_to_content() {
|
||||||
|
let merged = with_builtin_aggregates(Default::default());
|
||||||
|
let schema = &merged[EVENTS_BUCKET];
|
||||||
|
assert_eq!(schema.initial, "announced");
|
||||||
|
assert_eq!(schema.allowed("announced"), ["awaiting_summary", "summarized"]);
|
||||||
|
assert_eq!(schema.allowed("awaiting_summary"), ["summarized"]);
|
||||||
|
|
||||||
|
let content = crate::aggregates::parse_aggregates_yaml(
|
||||||
|
"aggregates:\n - bucket: portal_events\n initial: mine\n states:\n mine: { event: mine }\n",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(with_builtin_aggregates(content)[EVENTS_BUCKET].initial, "mine");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn bucket_is_read_sees_kv_resources() {
|
||||||
|
let qs = question_with_transitions(" - { to: middle, label: Go }");
|
||||||
|
assert!(bucket_is_read(&qs, "things"));
|
||||||
|
assert!(!bucket_is_read(&qs, EVENTS_BUCKET));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── inline markdown ──────────────────────────────────────────────────
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn markdown_links_and_emphasis() {
|
||||||
|
assert_eq!(
|
||||||
|
render_inline_markdown("See [the programme](https://attac.no/x) *soon*."),
|
||||||
|
"See <a href=\"https://attac.no/x\">the programme</a> <em>soon</em>."
|
||||||
|
);
|
||||||
|
assert_eq!(render_inline_markdown("plain text"), "plain text");
|
||||||
|
assert_eq!(render_inline_markdown("a\nb"), "a b");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn markdown_drops_html_and_unsafe_links() {
|
||||||
|
assert_eq!(render_inline_markdown("x <script>y</script> z"), "x y z");
|
||||||
|
assert_eq!(render_inline_markdown("[bad](javascript:alert(1))"), "bad");
|
||||||
|
assert_eq!(render_inline_markdown("[ok](/shape)"), "<a href=\"/shape\">ok</a>");
|
||||||
|
assert_eq!(render_inline_markdown("[mail](mailto:bl@uhhm.no)"), "<a href=\"mailto:bl@uhhm.no\">mail</a>");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,9 @@ pub mod resource;
|
|||||||
#[cfg(feature = "ssr")]
|
#[cfg(feature = "ssr")]
|
||||||
pub mod aggregates;
|
pub mod aggregates;
|
||||||
|
|
||||||
|
#[cfg(feature = "ssr")]
|
||||||
|
pub mod announce;
|
||||||
|
|
||||||
#[cfg(feature = "ssr")]
|
#[cfg(feature = "ssr")]
|
||||||
pub mod server;
|
pub mod server;
|
||||||
|
|
||||||
|
|||||||
+7
-1
@@ -30,7 +30,9 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
let content_branch = std::env::var("CONTENT_BRANCH").unwrap_or_else(|_| "main".to_string());
|
let content_branch = std::env::var("CONTENT_BRANCH").unwrap_or_else(|_| "main".to_string());
|
||||||
let gitea_base = content::gitea_api_base(&content_repo)?;
|
let gitea_base = content::gitea_api_base(&content_repo)?;
|
||||||
let content_raw_base = content::gitea_raw_base(&content_repo)?;
|
let content_raw_base = content::gitea_raw_base(&content_repo)?;
|
||||||
let aggregates = content::load_aggregates_from_gitea(&content_repo, &content_branch).await?;
|
let aggregates = content::with_builtin_aggregates(
|
||||||
|
content::load_aggregates_from_gitea(&content_repo, &content_branch).await?,
|
||||||
|
);
|
||||||
let questions = content::load_questions_from_gitea(&content_repo, &content_branch, "questions").await?;
|
let questions = content::load_questions_from_gitea(&content_repo, &content_branch, "questions").await?;
|
||||||
content::validate_questions(&questions, &aggregates)?;
|
content::validate_questions(&questions, &aggregates)?;
|
||||||
let site = content::load_site_from_gitea(&content_repo, &content_branch).await?;
|
let site = content::load_site_from_gitea(&content_repo, &content_branch).await?;
|
||||||
@@ -89,6 +91,10 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
garage,
|
garage,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Announced pages: keep their desk records current, close ended
|
||||||
|
// windows (see announce.rs).
|
||||||
|
tokio::spawn(portal::announce::run(state.clone()));
|
||||||
|
|
||||||
// Dev-friendly defaults: in-memory sessions, secure cookies only when
|
// Dev-friendly defaults: in-memory sessions, secure cookies only when
|
||||||
// COOKIE_SECURE=true (set it behind TLS in production) - same
|
// COOKIE_SECURE=true (set it behind TLS in production) - same
|
||||||
// defaults cnats uses. SameSite=Lax (tower-sessions defaults to
|
// defaults cnats uses. SameSite=Lax (tower-sessions defaults to
|
||||||
|
|||||||
@@ -206,6 +206,56 @@ main.not-found {
|
|||||||
min-height: 55svh;
|
min-height: 55svh;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* announcements - live event pages, a strip above the hero copy.
|
||||||
|
Header, not footer: the one place a page claims attention before
|
||||||
|
the question is asked. */
|
||||||
|
.announce {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.6rem 1.2rem;
|
||||||
|
margin: -2rem 0 0.5rem;
|
||||||
|
font-size: 0.88rem;
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.announce-item {
|
||||||
|
display: inline-flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: baseline;
|
||||||
|
gap: 0.35rem 0.7rem;
|
||||||
|
padding: 0.45rem 0.9rem;
|
||||||
|
border: 0.06rem solid var(--line);
|
||||||
|
border-left: 0.2rem solid var(--accent);
|
||||||
|
border-radius: 0.3rem;
|
||||||
|
color: var(--ink);
|
||||||
|
text-decoration: none;
|
||||||
|
background: var(--paper);
|
||||||
|
transition: border-color 120ms;
|
||||||
|
}
|
||||||
|
|
||||||
|
.announce-item:hover,
|
||||||
|
.announce-item[aria-current="page"] {
|
||||||
|
border-color: var(--accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.announce-name {
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.announce-when {
|
||||||
|
color: var(--ink-dim);
|
||||||
|
}
|
||||||
|
|
||||||
|
.announce-relative {
|
||||||
|
color: var(--accent);
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.06em;
|
||||||
|
font-size: 0.72rem;
|
||||||
|
}
|
||||||
|
|
||||||
/* alternatives */
|
/* alternatives */
|
||||||
|
|
||||||
/* position + z-index on these three: everything that scrolls over the
|
/* position + z-index on these three: everything that scrolls over the
|
||||||
@@ -398,6 +448,24 @@ main.not-found {
|
|||||||
margin-bottom: 0.15em;
|
margin-bottom: 0.15em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* links inside markdown descriptions */
|
||||||
|
.alt-description a,
|
||||||
|
.feature p a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
border-bottom: 0.06rem solid var(--accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.alt-description a:hover,
|
||||||
|
.feature p a:hover {
|
||||||
|
color: var(--accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.alt-description code,
|
||||||
|
.feature p code {
|
||||||
|
font-size: 0.9em;
|
||||||
|
}
|
||||||
|
|
||||||
.feature p {
|
.feature p {
|
||||||
color: var(--ink-dim);
|
color: var(--ink-dim);
|
||||||
font-size: 0.95rem;
|
font-size: 0.95rem;
|
||||||
|
|||||||
Reference in New Issue
Block a user