Complete insert and update on create. Basically first complete working version

2025-01-28 23:46:10 +01:00
parent 5760335304
commit 380795d054
6 changed files with 95 additions and 191 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,21 +17,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"

-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "anstream"
 version = "0.6.18"
@@ -245,47 +230,18 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"

-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
 [[package]]
 name = "bytes"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"

-[[package]]
-name = "cc"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
-dependencies = [
- "shlex",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

-[[package]]
-name = "chrono"
-version = "0.4.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-targets",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.27"
@@ -332,12 +288,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"

-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
 [[package]]
 name = "darling"
 version = "0.20.10"
@@ -562,11 +512,11 @@ dependencies = [
 "askama",
 "askama_axum",
 "axum",
- "chrono",
 "clap",
 "deadpool-diesel",
 "diesel",
 "dotenvy",
+ "serde",
 "tokio",
 "tower",
 "tower-http",
@@ -670,29 +620,6 @@ dependencies = [
 "tower-service",
 ]

-[[package]]
-name = "iana-time-zone"
-version = "0.1.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -711,16 +638,6 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"

-[[package]]
-name = "js-sys"
-version = "0.3.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1052,12 +969,6 @@ dependencies = [
 "lazy_static",
 ]

-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.2"
@@ -1336,60 +1247,6 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

-[[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
-dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1412,15 +1269,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,11 +6,11 @@ edition = "2021"
 [dependencies]
 tokio = { version = "1", features = ["full"] }
 axum = "0.7.9"
+serde = { version = "1.0.217", features = ["derive"] }
 tower = "0.5.2"
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
 tower-http = { version = "0.6.2", features = ["cors", "trace", "fs"] }
-chrono = "0.4.39"
 diesel = { version = "2.2.0", features = ["sqlite", "returning_clauses_for_sqlite_3_35"] }
 dotenvy = "0.15"
 anyhow = "1.0.95"
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,4 @@
 use diesel::prelude::*;
-use std::env;
-use std::sync::Arc;
 use anyhow::{anyhow, Result, Context};
 use askama_axum::Template;
 use axum::{
@@ -8,11 +6,11 @@ use axum::{
    http::{Method, header, StatusCode, Request, Uri},
    response::{IntoResponse, Response, Html},
    routing::{get, post},
-    Json, Router,
+    Json, Router, Form
 };
+use axum::http::HeaderValue;
 use deadpool_diesel::sqlite::{Runtime, Manager, Pool};
 use clap::Parser;
-use tokio::sync::Mutex;
 use tower::{ServiceBuilder};
 use tower_http::{
    cors::{Any, CorsLayer},
@@ -20,6 +18,7 @@ use tower_http::{
    services::ServeDir,
    LatencyUnit
 };
+use serde::Deserialize;
 use tracing::{
    info, error, debug, info_span, enabled,
    instrument, Level, Span
@@ -44,7 +43,6 @@ struct Config {
 struct AppContext {
    config: Config,
    pool: Pool,
-    counter: Arc<Mutex<i32>>
 }

 async fn establish_connection(database_url: &str) -> Pool {
@@ -71,7 +69,6 @@ async fn main() -> Result<()> {
    let context = AppContext {
        config: config.clone(),
        pool: pool.clone(),
-        counter: Arc::new(Mutex::new(0)),
    };
    // Prepare Middlewares
    let cors = CorsLayer::very_permissive();
@@ -99,6 +96,7 @@ async fn main() -> Result<()> {
    let app = Router::new()
        .nest_service("/assets", ServeDir::new("assets"))
        .route("/", get(index))
+        .route("/feed/", get(get_list_feed).post(post_feed))
        .route("/feed/:id/", get(get_feed))
        .layer(middlewares)
        .with_state(context.clone());
@@ -144,15 +142,42 @@ async fn get_feed(
    }
 }

-#[derive(Template)]
-#[template(path = "index.html")]
-struct IndexTemplate {
-    feeds: Vec<RssFeed>,
+#[derive(Deserialize)]
+struct PostForm{
+    name: String,
+    feed_url: String,
 }

-async fn index(
+async fn post_feed(
    State(ctx): State<AppContext>,
-) -> IndexTemplate {
+    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| {
+        let new_feed = NewRssFeed{name: post.name.as_str(), feed_url: post.feed_url.as_str() };
+        diesel::insert_into(rss_feeds)
+            .values(&new_feed)
+            .returning(RssFeed::as_select())
+            .get_result(conn)
+            .expect("Error saving new feed")
+    }).await.unwrap();
+    let mut res = FeedTemplate{ feed: result }.into_response();
+    // Trigger HTMX Update event
+    res.headers_mut().insert("HX-Trigger", HeaderValue::from_static("newFeed"));
+    res
+}
+
+
+#[derive(Template)]
+#[template(path = "feeds.html")]
+struct FeedsTemplate {
+    feeds: Vec<RssFeed>
+}
+
+async fn get_list_feed(
+    State(ctx): State<AppContext>,
+) -> FeedsTemplate {
    let conn = ctx.pool.get().await.unwrap();
    use self::schema::rss_feeds::dsl::*;
    let result = conn.interact(|conn| {
@@ -161,5 +186,18 @@ async fn index(
            .load(conn)
            .expect("Error loading feeds")
    }).await.unwrap();
-    IndexTemplate { feeds: result }
+    FeedsTemplate{ feeds: result }
+}
+
+#[derive(Template)]
+#[template(path = "index.html")]
+struct IndexTemplate {
+    feeds: FeedsTemplate
+}
+
+async fn index(
+    State(ctx): State<AppContext>,
+) -> IndexTemplate {
+    let feeds = get_list_feed(State(ctx)).await;
+    IndexTemplate { feeds }
 }
--- a/src/models.rs
+++ b/src/models.rs
@@ -8,4 +8,12 @@ pub struct RssFeed {
    pub name: String,
    pub feed_url: String,
    pub last_pub_date: Option<String>,
+}
+
+
+#[derive(Insertable)]
+#[diesel(table_name = crate::schema::rss_feeds)]
+pub struct NewRssFeed<'a> {
+    pub name: &'a str,
+    pub feed_url: &'a str,
 }
--- a/templates/feeds.html
+++ b/templates/feeds.html
@@ -0,0 +1,3 @@
+{% for feed in feeds %}
+{% include "feed.html" %}
+{% endfor %}
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,7 +7,10 @@
    .navbar {
        overflow: hidden;
        position: fixed;
+        top: 0;
+        left: 0;
        width: 100%;
+        background: #161b22;
    }

    .overlay {
@@ -36,34 +39,38 @@
    <div style="display:flex; justify-content:flex-end">
        <button x-on:click="isModalOpen = true">Create</button>
    </div>
-    <div class="overlay" x-show="isModalOpen" x-cloak></div>
-    <dialog open x-show="isModalOpen" x-cloak x-transition>
+    <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</h2>
+            <h2>Create new RSS Feed subscription</h2>
        </header>
-        <p>
-            <b><strong>Gol D. Roger</strong></b>
-            <br>
-            <b>฿5,564,800,000</b>
-        </p>
-        <p>
-            Kono sakuhin ha fiction dethunode jitsuzaisuru jinbutsu dantai sonota no soshiki to doitsu no meishou ga
-            gekichu ni toujyou shitatoshitemo jitsuzai na monotoha issai mukankeideth.
-        </p>
+        <form id="create_form" hx-post="/feed/" hx-swap="none">
+            <label>
+                Name
+                <input type="text" name="name">
+            </label>
+            <label>
+                Feed URL
+                <input type="url" name="feed_url">
+            </label>
+        </form>
        <footer>
-            <button x-on:click="isModalOpen = false">Close</button>
+            <button form="create_form" type="reset" x-on:click="isModalOpen = false">Close</button>
+            <button form="create_form" type="submit">Submit</button>
        </footer>
    </dialog>
+    <table style="text-align:center">
+        <thead>
+        <tr>
+            <th>Feed Name</th>
+            <th>Feed URL</th>
+            <th>Last Mail Sent</th>
+            <th>Actions</th>
+        </tr>
+        </thead>
+        <tbody hx-get="/feed/" hx-trigger="newFeed from:body" x-on:htmx:after-settle="isModalOpen = false">
+        {{ feeds|safe }}
+        </tbody>
+    </table>
 </div>
-<table style="text-align:center">
-    <tr>
-        <th>Feed Name</th>
-        <th>Feed URL</th>
-        <th>Last Mail Sent</th>
-        <th>Actions</th>
-    </tr>
-    {% for feed in feeds %}
-    {% include "feed.html" %}
-    {% endfor %}
-</table>
 {% endblock %}