diff options
| -rw-r--r-- | src/frontend/mod.rs | 6 | ||||
| -rw-r--r-- | src/frontend/templates/mod.rs | 33 |
2 files changed, 27 insertions, 12 deletions
diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs index 1069b92..daeebd9 100644 --- a/src/frontend/mod.rs +++ b/src/frontend/mod.rs @@ -278,7 +278,7 @@ pub fn homepage<D: Storage>(db: D, endpoints: IndiewebEndpoints) -> impl Filter< Box::new(warp::reply::html(Template { title: &blog_name, blog_name: &blog_name, - endpoints, + endpoints: Some(endpoints), feeds, user: None, // TODO content: MainPage { feed: &feed, card: &card }.to_string() @@ -303,7 +303,7 @@ pub fn onboarding<D: Storage, T: hyper::client::connect::Connect + Clone + Send .map(move || warp::reply::html(Template { title: "Kittybox - Onboarding", blog_name: "Kittybox", - endpoints: endpoints.clone(), + endpoints: Some(endpoints.clone()), feeds: vec![], user: None, content: OnboardingPage {}.to_string() @@ -408,7 +408,7 @@ pub fn catchall<D: Storage>(db: D, endpoints: IndiewebEndpoints) -> impl Filter< warp::reply::with_status(warp::reply::html(Template { title: &title, blog_name: &blog_name, - endpoints, + endpoints: Some(endpoints), feeds, user: None, // TODO content, diff --git a/src/frontend/templates/mod.rs b/src/frontend/templates/mod.rs index 364a716..1f7ac6a 100644 --- a/src/frontend/templates/mod.rs +++ b/src/frontend/templates/mod.rs @@ -25,7 +25,7 @@ mod onboarding; pub use onboarding::OnboardingPage; markup::define! { - Template<'a>(title: &'a str, blog_name: &'a str, endpoints: IndiewebEndpoints, feeds: Vec<MicropubChannel>, user: Option<String>, content: String) { + Template<'a>(title: &'a str, blog_name: &'a str, endpoints: Option<IndiewebEndpoints>, feeds: Vec<MicropubChannel>, user: Option<String>, content: String) { @markup::doctype() html { head { @@ -35,13 +35,15 @@ markup::define! { meta[name="viewport", content="initial-scale=1, width=device-width"]; // TODO: link rel= for common IndieWeb APIs: webmention, microsub link[rel="micropub", href="/micropub"]; // Static, because it's built into the server itself - link[rel="authorization_endpoint", href=&endpoints.authorization_endpoint]; - link[rel="token_endpoint", href=&endpoints.token_endpoint]; - @if endpoints.webmention.is_some() { - link[rel="webmention", href=&endpoints.webmention.as_ref()]; - } - @if endpoints.microsub.is_some() { - link[rel="microsub", href=&endpoints.microsub.as_ref()]; + @if let Some(endpoints) = endpoints { + link[rel="authorization_endpoint", href=&endpoints.authorization_endpoint]; + link[rel="token_endpoint", href=&endpoints.token_endpoint]; + @if let Some(webmention) = &endpoints.webmention { + link[rel="webmention", href=&webmention]; + } + @if let Some(microsub) = &endpoints.microsub { + link[rel="microsub", href=µsub]; + } } } body { @@ -443,8 +445,21 @@ markup::define! { } Some(msg) => { p { - "There was a following error in your request: " @msg + "There was a following error in your request:" } + blockquote { pre { @msg } } + } + } + } + StatusCode::INTERNAL_SERVER_ERROR => { + @match msg { + None => { + p { "It seems like you have found an error. Not to worry, it has already been logged." } + } + Some(msg) => { + p { "The server encountered an error while processing your request:" } + blockquote { @msg } + p { "Don't worry, it has already been logged." } } } } |