refactor app, make ready for authentication

src/main.rs

@@ -1,38 +1,18 @@
-use std::path::PathBuf;
-
-use axum::Router;
 use shuttle_secrets::SecretStore;
-use tower::ServiceBuilder;
-use tower_http::{
-    compression::CompressionLayer, normalize_path::NormalizePathLayer, services::ServeDir,
-    trace::TraceLayer,
-};
 
-mod auth;
 mod router;
+mod services;
 
 #[shuttle_runtime::main]
 async fn axum(#[shuttle_secrets::Secrets] secret_store: SecretStore) -> shuttle_axum::ShuttleAxum {
-    // TODO:
-    // - add `authorizer to state` ???
-    // - make it compile again...
-
-    let _auth = auth::Auth::new(
+    let auth = services::Auth::new(
         secret_store.get("AUTH_PRIVATE_KEY").unwrap(),
         secret_store.get("AUTHORIZED_EMAILS").unwrap(),
         secret_store.get("SENDGRID_API_KEY").unwrap(),
     );
 
-    let router = Router::new()
-        .nest_service("/static", ServeDir::new(PathBuf::from("static")))
-        .nest("/", router::new())
-        .fallback(router::not_found::any)
-        .layer(
-            ServiceBuilder::new()
-                .layer(TraceLayer::new_for_http())
-                .layer(CompressionLayer::new())
-                .layer(NormalizePathLayer::trim_trailing_slash()),
-        );
+    let state = router::State { auth };
+    let router = router::new(state);
 
     Ok(router.into())
 }

src/router/login.rs

@@ -1,5 +1,5 @@
 use askama_axum::{IntoResponse, Response};
-use axum::{extract::Query, response::Redirect, Form};
+use axum::{extract::Query, http::StatusCode, response::Redirect, Form};
 use serde::Deserialize;
 
 #[derive(Deserialize)]
@@ -24,11 +24,14 @@ pub struct PostParams {
 
 pub async fn post(Form(params): Form<PostParams>) -> Response {
     if params.email.is_empty() {
-        return super::shared::ErrorTemplate {
-            title: "email is required".to_string(),
-            message: "Please enter your email address.".to_string(),
-        }
-        .into_response();
+        return (
+            StatusCode::BAD_REQUEST,
+            super::shared::ErrorTemplate {
+                title: "email is required".to_string(),
+                message: "Please enter your email address.".to_string(),
+            },
+        )
+            .into_response();
     }
     super::shared::InfoTemplate {
         title: format!("email sent to {}", params.email),

src/router/memory.rs

@@ -0,0 +1,21 @@
+use axum::http::HeaderMap;
+
+pub async fn get_robots_txt() -> &'static str {
+    r"User-agent: *
+Allow: /
+Sitemap: https://bckt.xyz/sitemap.xml
+"
+}
+
+pub async fn get_sitemap_xml() -> impl axum::response::IntoResponse {
+    let body = r#"<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+    <url>
+        <loc>https://bckt.xyz/</loc>
+    </url>
+</urlset>"#;
+
+    let mut headers = HeaderMap::new();
+    headers.insert("content-type", "application/xml".parse().unwrap());
+
+    (headers, body)
+}

src/router/mod.rs

@@ -1,46 +1,50 @@
+use std::{path::PathBuf, sync::Arc};
+
 use axum::{
-    http::HeaderMap,
-    response::IntoResponse,
     routing::{get, post},
     Router,
 };
+use tower::ServiceBuilder;
+use tower_http::{
+    compression::CompressionLayer, normalize_path::NormalizePathLayer, services::ServeDir,
+    trace::TraceLayer,
+};
 
 mod index;
 mod link;
 mod login;
+mod memory;
+mod not_found;
 mod redirect;
 mod shared;
 
-pub mod not_found;
-
-pub async fn get_robots_txt() -> &'static str {
-    r"User-agent: *
-Allow: /
-Sitemap: https://bckt.xyz/sitemap.xml
-"
-}
-
-pub async fn get_sitemap_xml() -> impl IntoResponse {
-    let body = r#"<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-    <url>
-        <loc>https://bckt.xyz/</loc>
-    </url>
-</urlset>"#;
-
-    let mut headers = HeaderMap::new();
-    headers.insert("content-type", "application/xml".parse().unwrap());
-
-    (headers, body)
+#[derive(Debug, Clone)]
+pub struct State {
+    pub auth: crate::services::Auth,
 }
 
-pub fn new() -> Router {
+fn new_root(state: State) -> Router {
     Router::new()
         .route("/", get(index::get))
-        .route("/robots.txt", get(get_robots_txt))
-        .route("/sitemap.xml", get(get_sitemap_xml))
+        .route("/robots.txt", get(memory::get_robots_txt))
+        .route("/sitemap.xml", get(memory::get_sitemap_xml))
         .route("/link", get(link::get))
         .route("/link", post(link::post))
         .route("/login", get(login::get))
         .route("/login", post(login::post))
         .route("/:hash", get(redirect::get))
+        .with_state(Arc::new(state))
+}
+
+pub fn new(state: State) -> Router {
+    Router::new()
+        .nest_service("/static", ServeDir::new(PathBuf::from("static")))
+        .nest("/", new_root(state))
+        .fallback(not_found::any)
+        .layer(
+            ServiceBuilder::new()
+                .layer(TraceLayer::new_for_http())
+                .layer(CompressionLayer::new())
+                .layer(NormalizePathLayer::trim_trailing_slash()),
+        )
 }

src/router/not_found.rs

@@ -1,9 +1,16 @@
-use askama::Template;
+use axum::{
+    body::Body,
+    http::{Request, StatusCode},
+};
 
-#[derive(Template)]
-#[template(path = "../templates/404.html")]
-pub struct GetTemplate;
+use crate::router::shared::ErrorTemplate;
 
-pub async fn any() -> GetTemplate {
-    GetTemplate
+pub async fn any(request: Request<Body>) -> (StatusCode, ErrorTemplate) {
+    (
+        StatusCode::NOT_FOUND,
+        ErrorTemplate {
+            title: "404 — Not Found".to_string(),
+            message: format!("The page '{}' does not exist.", request.uri().path()),
+        },
+    )
 }

src/auth.rs → src/services/auth.rs

@@ -1,4 +1,4 @@
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Auth;
 
 // TODO implement using

src/services/mod.rs

@@ -0,0 +1,2 @@
+mod auth;
+pub use auth::Auth;

static/css/style.css

@@ -23,6 +23,7 @@
     --info-fg: #1D3557;
     --ok-fg: #457B9D;
     --bad-fg: #E63946;
+    --custom-error-text: #fff1f2;
     --warn-fg: #E76F51;
     --plain-graphical-fg: #1D3557;
     --info-graphical-fg: #457B9D;
@@ -52,6 +53,7 @@
         --info-fg: #F1FAEE;
         --ok-fg: #2A9D8F;
         --bad-fg: #E63946;
+        --custom-error-text: #fff1f2;
         --warn-fg: #E76F51;
         --plain-graphical-fg: #F1FAEE;
         --info-graphical-fg: #A8DADC;
@@ -61,7 +63,7 @@
         --plain-bg: #1D3557;
         --info-bg: #457B9D;
         --ok-bg: #2A9D8F;
-        --bad-bg: #f88690;
+        --bad-bg: #f7c1c5;
         --warn-bg: #E76F51;
     }
 }

static/js/bckt.js

@@ -0,0 +1,15 @@
+function init() {
+    console.log('hello');
+
+    document.body.addEventListener('htmx:beforeSwap', (evt) => {
+        console.log('beforeSwap', evt);
+        if ([400, 404].includes(evt.detail.xhr.status)) {
+            evt.detail.shouldSwap = true;
+            evt.detail.isError = false;
+        }
+    });
+}
+
+document.addEventListener("DOMContentLoaded", init);
+
+export { };

templates/base.html

@@ -23,8 +23,10 @@
     <meta property="og:image" content="/og-image">
 
     <script src="/static/js/htmx.min.js?v=1.9.6"></script>
+    <script type="module" src="/static/js/bckt.js?v=0.1.0"></script>
+
     <link rel="stylesheet" href="/static/css/missing.min.css?v=1.1.1" />
-    <link rel="stylesheet" href="/static/css/style.css?t=bucket&v=0.1.0" />
+    <link rel="stylesheet" href="/static/css/style.css?t=bucket&v=0.1.1" />
 </head>
 
 <body>

templates/content/login.html

@@ -6,7 +6,12 @@
         <div class="table rows spacious">
             <p>
                 <label for="email">email:</label>
-                <input id="email" name="email" type="email" placeholder="email" style="width: 100%; margin: 0 5px 0 0;">
+                <input
+                    id="email" name="email"
+                    type="email" placeholder="email"
+                    style="width: 100%; margin: 0 5px 0 0;"
+                    autofocus
+                >
             </p>
         </div>
         <p>

templates/content/shared/error.html

@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 {% block content %}
 <div class="box bad" style="width: 100%; max-width: 500px;">
-    <strong class="block titlebar" style="color: var(--bg); text-shadow: none;">{{ title }}</strong>
-    <p>{{ message }}</p>
+    <strong class="block titlebar" style="color: var(--custom-error-text); text-shadow: none;">{{ title }}</strong>
+    <p style="color: var(--bg);">{{ message }}</p>
     <p>
-        <a href="/" class="<button> big" style="margin: 10px 0 0 0; float: right;">↩ go back</a>
+        <a href="/" class="<button> big" style="margin: 10px 0 0 0; float: right;" autofocus>↩ go back</a>
     </p>
 </div>
 {% endblock %}

templates/content/shared/info.html

@@ -4,7 +4,7 @@
     <strong class="block titlebar">{{ title }}</strong>
     <p>{{ message }}</p>
     <p>
-        <a href="/" class="<button> good big" style="margin: 10px 0 0 0; float: right;">↩ go back</a>
+        <a href="/" class="<button> good big" style="margin: 10px 0 0 0; float: right;" autofocus>↩ go back</a>
     </p>
 </div>
 {% endblock %}