Remove custom htmx indicator mechanism

assets/oval.svg

@@ -0,0 +1,17 @@
+<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
+<svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
+    <g fill="none" fill-rule="evenodd">
+        <g transform="translate(1 1)" stroke-width="2">
+            <circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
+            <path d="M36 18c0-9.94-8.06-18-18-18">
+                <animateTransform
+                    attributeName="transform"
+                    type="rotate"
+                    from="0 18 18"
+                    to="360 18 18"
+                    dur="1s"
+                    repeatCount="indefinite"/>
+            </path>
+        </g>
+    </g>
+</svg>

httptests/Index.http

@@ -1,4 +0,0 @@
-### GET request to index
-GET http://{{host}}:{{port}}/
-
-###

httptests/http-client.env.json

@@ -1,6 +0,0 @@
-{
-  "dev": {
-    "host": "127.0.0.1",
-    "port": "3000"
-  }
-}

src/main.rs

@@ -1,13 +1,7 @@
 use diesel::prelude::*;
 use anyhow::{anyhow, Result, Context};
 use askama_axum::Template;
-use axum::{
+use axum::{extract::{Path, State}, http::{Method, header, StatusCode, Request, Uri}, response::{IntoResponse, Response, Html}, routing::{get, post}, Json, Router, Form, http};
-    extract::{Path, State},
-    http::{Method, header, StatusCode, Request, Uri},
-    response::{IntoResponse, Response, Html},
-    routing::{get, post},
-    Json, Router, Form
-};
 use axum::http::HeaderValue;
 use deadpool_diesel::sqlite::{Runtime, Manager, Pool};
 use clap::Parser;
@@ -97,7 +91,9 @@ async fn main() -> Result<()> {
         .nest_service("/assets", ServeDir::new("assets"))
         .route("/", get(index))
         .route("/feed/", get(get_list_feed).post(post_feed))
-        .route("/feed/:id/", get(get_feed))
+        .route("/feed/:id", get(get_feed).delete(delete_feed).put(put_feed))
+        .route("/feed/:id/edit/form", get(get_feed_form))
+        .route("/feed/:id/edit/inline", get(get_feed_inline))
         .layer(middlewares)
         .with_state(context.clone());
     // Run our app with hyper
@@ -142,7 +138,76 @@ async fn get_feed(
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Template)]
+#[template(path="feed_form.html")]
+struct FeedFormTemplate {
+    feed: RssFeed
+}
+
+async fn get_feed_form(
+    State(ctx): State<AppContext>,
+    Path(feed_id): Path<i32>
+) -> impl IntoResponse {
+    let conn = ctx.pool.get().await.unwrap();
+    use self::schema::rss_feeds::dsl::*;
+    let result = conn.interact(move |conn| {
+        rss_feeds
+            .find(feed_id)
+            .select(RssFeed::as_select())
+            .first(conn)
+            .optional()
+            .expect("Error loading feeds")
+    }).await.unwrap();
+    if let Some(feed) = result {
+        FeedFormTemplate{ feed }
+    } else {
+        FeedFormTemplate{
+            feed: RssFeed{
+                id: -1,
+                name: "ERROR".to_string(),
+                feed_url: "ERROR".to_string(),
+                last_pub_date: Some("ERROR".to_string())
+            }
+        }
+    }
+}
+
+#[derive(Template)]
+#[template(path="feed_inline.html")]
+struct FeedInlineTemplate {
+    feed: RssFeed
+}
+
+async fn get_feed_inline(
+    State(ctx): State<AppContext>,
+    Path(feed_id): Path<i32>
+) -> impl IntoResponse {
+    let conn = ctx.pool.get().await.unwrap();
+    use self::schema::rss_feeds::dsl::*;
+    let result = conn.interact(move |conn| {
+        rss_feeds
+            .find(feed_id)
+            .select(RssFeed::as_select())
+            .first(conn)
+            .optional()
+            .expect("Error loading feeds")
+    }).await.unwrap();
+    if let Some(feed) = result {
+        FeedInlineTemplate{ feed }
+    } else {
+        FeedInlineTemplate{
+            feed: RssFeed{
+                id: -1,
+                name: "ERROR".to_string(),
+                feed_url: "ERROR".to_string(),
+                last_pub_date: Some("ERROR".to_string())
+            }
+        }
+    }
+}
+
+#[derive(Deserialize, AsChangeset)]
+#[diesel(table_name = crate::schema::rss_feeds)]
 struct PostForm{
     name: String,
     feed_url: String,
@@ -162,15 +227,32 @@ async fn post_feed(
             .get_result(conn)
             .expect("Error saving new feed")
     }).await.unwrap();
-    let mut res = FeedTemplate{ feed: result }.into_response();
+    FeedTemplate{ feed: result }
-    // Trigger HTMX Update event
+}
-    res.headers_mut().insert("HX-Trigger", HeaderValue::from_static("newFeed"));
+
-    res
+async fn put_feed(
+    State(ctx): State<AppContext>,
+    Path(feed_id): Path<i32>,
+    Form(post): Form<PostForm>
+) -> impl IntoResponse {
+    let conn = ctx.pool.get().await.unwrap();
+    use self::schema::rss_feeds::dsl::*;
+    let result = conn.interact(move |conn| {
+        diesel::update(rss_feeds.find(feed_id))
+            .set(post)
+            .returning(RssFeed::as_select())
+            .get_result(conn)
+            .expect("Error updating feed")
+    }).await.unwrap();
+    FeedTemplate{ feed: result }
 }
 
 
 #[derive(Template)]
-#[template(path = "feeds.html")]
+#[template(source="\
+{% for feed in feeds %}
+{% include \"feed.html\" %}
+{% endfor %}", ext="html")]
 struct FeedsTemplate {
     feeds: Vec<RssFeed>
 }
@@ -189,6 +271,26 @@ async fn get_list_feed(
     FeedsTemplate{ feeds: result }
 }
 
+async fn delete_feed(
+    State(ctx): State<AppContext>,
+    Path(feed_id): Path<i32>,
+) -> impl IntoResponse {
+    let conn = ctx.pool.get().await.unwrap();
+    use self::schema::rss_feeds::dsl::*;
+    let num_deleted = conn.interact(move |conn| {
+        diesel::delete(rss_feeds.find(feed_id))
+            .execute(conn)
+            .expect("Error deleting posts")
+    }).await.unwrap();
+    if num_deleted == 0 {
+        (StatusCode::NOT_FOUND, "Not found")
+    } else {
+        // HTMX swaps only on 200, so we cannot use NO_CONTENT
+        // In fact, MSDN says that NO_CONTENT means "do nothing", but this is debated.
+        (StatusCode::OK, "")
+    }
+}
+
 #[derive(Template)]
 #[template(path = "index.html")]
 struct IndexTemplate {

templates/base.html

@@ -2,12 +2,13 @@
 <html lang="en">
 <head>
     <link rel="stylesheet" href="https://matcha.mizu.sh/matcha.css">
-<!--    <script src="https://cdn.twind.style" crossorigin></script>-->
     <title>{% block title %}{{ title }}{% endblock %}</title>
     <script src="https://unpkg.com/htmx.org@2.0.4"></script>
     <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.14.8/dist/cdn.min.js"></script>
     <style>
-        [x-cloak] { display: none !important; }
+        [x-cloak] {
+            display: none !important;
+        }
     </style>
     {% block head %}{% endblock %}
 </head>

templates/feed.html

@@ -3,11 +3,22 @@
     <td>{{feed.feed_url}}</td>
     <td>{{feed.last_pub_date.clone().unwrap_or("None".to_string())}}</td>
     <td>
-        <button hx-get="/feed/{{feed.id}}/"
+        <button hx-get="/feed/{{feed.id}}/edit/inline"
                 hx-target="#feed_{{feed.id}}"
-                hx-swap="outerHTML"
+                hx-swap="outerHTML">
-                hx-trigger="click">
+            Edit Inline
-            Refresh
+        </button>
+        <button hx-get="/feed/{{feed.id}}/edit/form"
+                hx-target="body"
+                hx-swap="beforeend">
+            Edit Dialog
+        </button>
+        <button class="danger"
+                hx-confirm="Are you sure?"
+                hx-delete="/feed/{{feed.id}}"
+                hx-target="#feed_{{feed.id}}"
+                hx-swap="outerHTML">
+            Delete
         </button>
     </td>
 </tr>

templates/feed_form.html

@@ -0,0 +1,29 @@
+<div id="modal" x-data>
+    <div class="overlay" style="z-index: 30"></div>
+    <dialog open style="z-index: 31">
+        <header>
+            <h2>Modify RSS Feed subscription</h2>
+        </header>
+        <form id="modify_form" hx-put="/feed/{{feed.id}}" hx-target="#feed_{{feed.id}}" hx-swap="outerHTML"
+              hx-indicator="#mod_indicator"
+              @htmx:after-on-load="document.getElementById('modal').remove()">
+            <label>
+                Name
+                <input type="text" name="name" value="{{feed.name}}">
+            </label>
+            <label>
+                Feed URL
+                <input type="url" name="feed_url" value="{{feed.feed_url}}">
+            </label>
+        </form>
+        <footer>
+            <button form="modify_form" type="reset" @click="document.getElementById('modal').remove()">Close
+            </button>
+            <button form="modify_form" type="submit">
+                Submit
+                <img id="mod_indicator" class="htmx-indicator" src="/assets/oval.svg"
+                     style="height: 1rem; margin-left: 2px" alt="...">
+            </button>
+        </footer>
+    </dialog>
+</div>

templates/feed_inline.html

@@ -0,0 +1,29 @@
+<tr id="feed_{{feed.id}}">
+    <td>
+        <label style="width: 100%">
+            <input type="text" name="name" form="update_feed_{{feed.id}}" value="{{feed.name}}">
+        </label>
+    </td>
+    <td>
+        <label style="width: 100%">
+            <input type="url" name="feed_url" form="update_feed_{{feed.id}}" value="{{feed.feed_url}}">
+        </label>
+    </td>
+    <td>{{feed.last_pub_date.clone().unwrap_or("None".to_string())}}</td>
+    <td>
+        <form id="update_feed_{{feed.id}}" hx-put="/feed/{{feed.id}}" hx-target="#feed_{{feed.id}}" hx-swap="outerHTML"
+              hx-indicator="update_feed_{{feed.id}}_indicator" style="padding: 0; background: unset">
+            <button type="reset"
+                    hx-get="/feed/{{feed.id}}"
+                    hx-target="#feed_{{feed.id}}"
+                    hx-swap="outerHTML">
+                Cancel
+            </button>
+            <button type="submit">
+                Confirm
+                <img id="update_feed_{{feed.id}}_indicator" class="htmx-indicator" src="/assets/oval.svg"
+                     style="height: 1rem; margin-left: 2px" alt="...">
+            </button>
+        </form>
+    </td>
+</tr>

templates/feeds.html

@@ -1,3 +0,0 @@
-{% for feed in feeds %}
-{% include "feed.html" %}
-{% endfor %}

templates/index.html

@@ -22,6 +22,14 @@
         background: #161b22;
         opacity: 0.75;
     }
+
+    th {
+        white-space: nowrap;
+    }
+
+    td {
+        white-space: nowrap;
+    }
 </style>
 {% endblock %}
 
@@ -37,14 +45,15 @@
 <div style="height: 48px; margin-bottom: 8px"></div>
 <div x-data="{'isModalOpen': false}">
     <div style="display:flex; justify-content:flex-end">
-        <button x-on:click="isModalOpen = true">Create</button>
+        <button @click="isModalOpen = true">Create</button>
     </div>
     <div class="overlay" style="z-index: 30" x-show="isModalOpen" x-cloak></div>
     <dialog open style="z-index: 31" x-show="isModalOpen" x-cloak x-transition>
         <header>
             <h2>Create new RSS Feed subscription</h2>
         </header>
-        <form id="create_form" hx-post="/feed/" hx-swap="none">
+        <form id="create_form" hx-post="/feed/" hx-target="#feed_tbody" hx-swap="beforeend" hx-indicator="#indicator"
+              @htmx:after-on-load="document.getElementById('create_form').reset();isModalOpen = false">
             <label>
                 Name
                 <input type="text" name="name">
@@ -55,8 +64,12 @@
             </label>
         </form>
         <footer>
-            <button form="create_form" type="reset" x-on:click="isModalOpen = false">Close</button>
+            <button form="create_form" type="reset" @click="isModalOpen = false">Close</button>
-            <button form="create_form" type="submit">Submit</button>
+            <button form="create_form" type="submit">
+                Submit
+                <img id="indicator" class="htmx-indicator" src="/assets/oval.svg" style="height: 1rem; margin-left: 2px"
+                     alt="...">
+            </button>
         </footer>
     </dialog>
     <table style="text-align:center">
@@ -68,7 +81,7 @@
             <th>Actions</th>
         </tr>
         </thead>
-        <tbody hx-get="/feed/" hx-trigger="newFeed from:body" x-on:htmx:after-settle="isModalOpen = false">
+        <tbody id="feed_tbody">
         {{ feeds|safe }}
         </tbody>
     </table>