Adding family members

.sqlx/query-f2d5d7e2aa1946350677f5585e789a1f2fe9721354b5907ff83c4b35e37f3df8.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n        create table if not exists 'family_members' (avatar_url text not null, name text not null);\n        create table if not exists 'todo' (family_member_name text, 'text' text, done_at datetime);\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 0
+    },
+    "nullable": []
+  },
+  "hash": "f2d5d7e2aa1946350677f5585e789a1f2fe9721354b5907ff83c4b35e37f3df8"
+}

Cargo.lock

@@ -104,6 +104,7 @@ checksum = "d09dbe0e490df5da9d69b36dca48a76635288a82f92eca90024883a56202026d"
 dependencies = [
  "async-trait",
  "axum-core",
+ "axum-macros",
  "bytes",
  "futures-util",
  "http",
@@ -151,6 +152,18 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "axum-macros"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a2edad600410b905404c594e2523549f1bcd4bded1e252c8f74524ccce0b867"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.69"
@@ -245,6 +258,7 @@ dependencies = [
  "iana-time-zone",
  "js-sys",
  "num-traits",
+ "serde",
  "wasm-bindgen",
  "windows-targets 0.48.5",
 ]

Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-axum = "0.7.3"
+axum = { version = "0.7.3", features = ["macros"] }
-chrono = "0.4.31"
+chrono = { version = "0.4.31", features = ["serde"] }
 maud = { git = "https://github.com/lambda-fairy/maud.git", rev="320add8", features = ["axum"] }
 serde = { version = "1.0.194", features = ["derive"] }
 sqlx = { version = "0.7.3", features = ["chrono", "sqlx-sqlite", "sqlite", "runtime-tokio"] }

build.rs

@@ -0,0 +1,5 @@
+// generated by `sqlx migrate build-script`
+fn main() {
+    // trigger recompilation when a new migration is added
+    println!("cargo:rerun-if-changed=migrations");
+}

flake.nix

@@ -14,12 +14,14 @@
       rust-dev = pkgs.mkShell {
         buildInputs = with pkgs; [
           sqlite
+          sqlx-cli
           cargo
           rustc
           rustfmt
           rustPackages.clippy
           rust-analyzer
         ];
+        DATABASE_URL = "sqlite:fam.db";
       };
 
       default = outputs.devShells.${system}.rust-dev;

migrations/20240105074308_init_tables.sql

@@ -0,0 +1,3 @@
+-- Add migration script here
+create table if not exists 'family_members' (avatar_url text not null, name text not null);
+create table if not exists 'todo' (family_member_name text, 'text' text, done_at datetime);

src/main.rs

@@ -1,73 +1,39 @@
-use std::sync::Arc;
+use axum::extract::State;
-
+use axum::response::Redirect;
-use axum::{extract::State, routing::get, Router};
+use axum::routing::post;
+use axum::Form;
+use axum::{routing::get, Router};
 use chrono::prelude::*;
+use chrono::serde::ts_seconds_option;
 use maud::{html, Markup, DOCTYPE};
-use sqlx::{Pool, Sqlite};
+use serde::{Deserialize, Serialize};
+use sqlx::{query, query_as, SqlitePool};
 use tower_http::services::ServeDir;
 use tracing::{debug, info, instrument, trace};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
-struct AppState {
-    dbpool: Pool<Sqlite>,
-}
-
 #[tokio::main]
 async fn main() {
     tracing_subscriber::registry()
         .with(
             tracing_subscriber::EnvFilter::try_from_default_env()
-                .unwrap_or_else(|_| "example_static_file_server=debug,tower_http=debug".into()),
+                .unwrap_or_else(|_| "debug".into()),
         )
         .with(tracing_subscriber::fmt::layer())
         .init();
 
-    let dbpool = sqlx::SqlitePool::connect("fam.db").await.unwrap();
+    let dbpool = SqlitePool::connect("fam.db").await.unwrap();
-
+    let _ = sqlx::migrate!().run(&dbpool).await;
-    //     let countries = sqlx::query!(
-    //         "
-    // SELECT country, COUNT(*) as count
-    // FROM users
-    // GROUP BY country
-    // WHERE organization = ?
-    //         ",
-    //         organization
-    //     )
-    //     .fetch_all(&dbpool) // -> Vec<{ country: String, count: i64 }>
-    //     .await?;
-
-    let _ = sqlx::query!(
-        r#"
-        create table if not exists 'family_members' (avatar_url text not null, name text not null);
-        create table if not exists 'todo' (family_member_name text, 'text' text, done_at datetime);
-    "#
-    )
-    .fetch_all(&dbpool)
-    .await
-    .unwrap();
-
-    //     let countries = sqlx::query!(
-    //         "
-    // SELECT country, COUNT(*) as count
-    // FROM users
-    // GROUP BY country
-    // WHERE organization = ?
-    //         ",
-    //         organization
-    //     )
-    //     .fetch_all(&dbpool) // -> Vec<{ country: String, count: i64 }>
-    //     .await?;
-
-    let state = Arc::new(AppState { dbpool });
 
     debug!("Debug showing");
     trace!("Trace showing");
 
     // build our application with a route
     let app = Router::new()
-        .with_state(state)
         .route("/", get(hello_world))
         .route("/admin", get(admin))
+        .route("/admin/new-list", post(new_list))
+        .with_state(dbpool)
         .nest_service("/assets", ServeDir::new("assets"));
 
     let bind = "0.0.0.0:3000";
@@ -76,17 +42,18 @@ async fn main() {
     axum::serve(listener, app).await.unwrap();
 }
 
-#[derive(sqlx::FromRow)]
+#[derive(sqlx::FromRow, Debug, Serialize, Deserialize)]
 struct FamilyMember {
     avatar_url: String,
     name: String,
 }
 
-#[derive(sqlx::FromRow)]
+#[derive(sqlx::FromRow, Debug, Serialize, Deserialize)]
 struct Todo {
     emoji: char,
     text: String,
-    done_at: Option<DateTime<Local>>,
+    #[serde(with = "ts_seconds_option")]
+    done_at: Option<DateTime<Utc>>,
 }
 
 fn head() -> Markup {
@@ -96,7 +63,7 @@ fn head() -> Markup {
             meta charset="utf-8" {}
             meta name="viewport" content="width=device-width, initial-scale=1" {}
             link rel="stylesheet" href="/assets/style.css" {}
-            // TODO: add htmx
+            script src="/assets/htmx-1.9.10.js" {}
             title { "Homeman" }
         }
     }
@@ -115,25 +82,13 @@ async fn hello_world() -> Markup {
     }
 }
 
-async fn admin(State(state): State<AppState>) -> Markup {
+async fn admin(State(dbpool): State<SqlitePool>) -> Markup {
-    // query data and show it
+    trace!("Admin page accessed");
-    //     let countries = sqlx::query!(
+    let family_members: Vec<FamilyMember> = query_as!(
-    //         "
-    // SELECT country, COUNT(*) as count
-    // FROM users
-    // GROUP BY country
-    // WHERE organization = ?
-    //         ",
-    //         organization
-    //     )
-    //     .fetch_all(&dbpool) // -> Vec<{ country: String, count: i64 }>
-    //     .await?;
-    trace!("Hello world page accessed");
-    let family_members: Vec<FamilyMember> = sqlx::query_as!(
         FamilyMember,
         "select name, avatar_url from 'family_members';"
     )
-    .fetch_all(&state.dbpool)
+    .fetch_all(&dbpool)
     .await
     .unwrap();
     html! {
@@ -146,10 +101,11 @@ async fn admin(State(state): State<AppState>) -> Markup {
                     li { (fam.name) }
                 }
             }
-            form hx-post="/admin/new-list" {
+            form action="/admin/new-list" method="POST" {
                 label {
                     "Name"
                     input id="name" name="name" type="text" placeholder="John Smith" {}
+                    input id="avatar_url" name="avatar_url" type="text" placeholder="/assets/yo.png" {}
                 }
                 button type="submit" {"Add Member"}
             }
@@ -157,4 +113,15 @@ async fn admin(State(state): State<AppState>) -> Markup {
     }
 }
 
-async fn add_todo_list() {}
+async fn new_list(State(dbpool): State<SqlitePool>, Form(fm): Form<FamilyMember>) -> Redirect {
+    trace!("New list creation attempt");
+    let _ = query!(
+        "insert into family_members (name, avatar_url) values (?1, ?2);",
+        fm.name,
+        fm.avatar_url
+    )
+    .execute(&dbpool)
+    .await
+    .unwrap();
+    Redirect::to("/admin")
+}