claude fix

Author: pgray

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ env:
 jobs:
   build:
     name: build test fmt etc
-    runs-on: ubuntu-latest # TODO: self-hosted explainer/link
+    runs-on: ubuntu-latest # TODO: self-hosted explainer/link for folks interested in running their own
 
     steps:
       - name: checkout code
@@ -65,7 +65,7 @@ jobs:
 
   build-release:
     name: Build Release
-    runs-on: self-hosted
+    runs-on: ubuntu-latest # TODO: self-hosted
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
 
     steps:

README.md

@@ -1,5 +1,7 @@
 # MADstack
 
+[![ci](https://github.com/pgray/MADstack/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/pgray/MADstack/actions/workflows/ci.yml)
+
 > ai stands for: angry! irate!
 
 MADstack (or madstack or mAdStAcK) is a small rust project template/example for use with [claude](https://claude.ai)
@@ -8,7 +10,7 @@ if you're going to make things easy with AI,
 
 why not also make other things "hard" with rust and as much compile-time checking as possible?
 
-## MAD! MAD?
+## MAD! MAD? >:|
 
 - M: [maud](https://maud.lambda.xyz/)
 - A: [axum](https://github.com/tokio-rs/axum)
@@ -20,21 +22,26 @@ why not also make other things "hard" with rust and as much compile-time checkin
 - copy this repo and start your own project
   - tell us about it or don't
 - open issues to improve or update dependencies as needed
-- tell us about amazing new dependenciess to replace old ones
+- tell us about amazing new dependencies to replace old ones
+  - no flaming
 
 ## FUTURE
 
 it would be swell if folks find this useful at all
 
-a long term goal could be to figure out a great fast and simple stack for web app dev for rust
+a long term goal could be:
+
+- figuring out the fastest/simplest/safest stack for web app dev for rust
+- a living repo of current-favorite+fastest+safest web app dependencies
 
 right now it exists as a pile of awesome dependencies
 
 thank you to you if you read this and please be grateful of all the amazing software that exists
 
 ## INSTALL?
 
-idk friend, maybe ask claude?
+1. install linux
+2. ask claude
 
 ## inspiration:
 
@@ -43,3 +50,13 @@ idk friend, maybe ask claude?
 - [arch linux](https://archlinux.org/)
 - [humanlayer's claude writeup](https://www.humanlayer.dev/blog/writing-a-good-claude-md)
 - experience with a few madstack apps
+
+## build/run
+
+```
+docker compose build
+docker compose up
+curl localhost:3000/echoes
+```
+
+## TODO: turn into a template repo? maybe?

bin/ccc

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 function c {
-  nice -n 19 cargo "$*"
+  nice -n 19 cargo "$@"
 }
 c fmt \
   && c check \

src/echoes.rs

@@ -0,0 +1,89 @@
+use axum::{
+    extract::{Form, State},
+    response::{Html, Redirect},
+};
+use diesel::prelude::*;
+use maud::html;
+use serde::Deserialize;
+use tracing::{debug, info, instrument};
+
+use crate::db::DbPool;
+use crate::handlers::layout;
+use crate::models::{Message, NewMessage};
+use crate::schema::messages;
+
+#[instrument(skip(pool))]
+pub async fn list(State(pool): State<DbPool>) -> Html<String> {
+    info!("GET /echoes route called");
+    debug!("Getting database connection from pool");
+    let mut conn = pool.get().expect("Failed to get DB connection");
+
+    debug!("Loading messages from database");
+    let messages_list = messages::table
+        .order(messages::created_at.desc())
+        .limit(50)
+        .load::<Message>(&mut conn)
+        .expect("Error loading messages");
+
+    info!(
+        message_count = messages_list.len(),
+        "Messages loaded successfully"
+    );
+
+    let content = html! {
+        h1 { "Echo Server" }
+
+        form method="post" action="/echoes" {
+            textarea name="content" rows="5" placeholder="Type your message here..." required {}
+            br;
+            button type="submit" { "Send Echo" }
+        }
+
+        h2 { "Recent Messages" }
+
+        @for message in messages_list {
+            div.message {
+                div.message-content { (message.content) }
+                div.message-time {
+                    "Sent at: "
+                    @let time = message.created_at;
+                    (format!("{:?}", time))
+                }
+            }
+        }
+    };
+
+    Html(layout(content).into_string())
+}
+
+#[derive(Deserialize)]
+pub struct EchoForm {
+    content: String,
+}
+
+#[instrument(skip(pool, form), fields(content_length = form.content.len()))]
+pub async fn create(State(pool): State<DbPool>, Form(form): Form<EchoForm>) -> Redirect {
+    info!("POST /echoes route called");
+    debug!("Getting database connection from pool");
+    let mut conn = pool.get().expect("Failed to get DB connection");
+
+    let content_preview = if form.content.len() > 50 {
+        format!("{}...", &form.content[..50])
+    } else {
+        form.content.clone()
+    };
+    debug!(content_preview = %content_preview, "Preparing to save message");
+
+    let new_message = NewMessage {
+        content: form.content,
+    };
+
+    debug!("Inserting message into database");
+    diesel::insert_into(messages::table)
+        .values(&new_message)
+        .execute(&mut conn)
+        .expect("Error saving message");
+
+    info!("Message saved successfully, redirecting to /echoes");
+    Redirect::to("/echoes")
+}

src/handlers.rs

@@ -1,17 +1,7 @@
-use axum::{
-    extract::{Form, State},
-    response::{Html, Redirect},
-};
-use diesel::prelude::*;
+use axum::response::Html;
 use maud::{DOCTYPE, Markup, html};
-use serde::Deserialize;
-use tracing::{debug, info, instrument};
 
-use crate::db::DbPool;
-use crate::models::{Message, NewMessage};
-use crate::schema::messages;
-
-fn layout(content: Markup) -> Markup {
+pub fn layout(content: Markup) -> Markup {
     html! {
         (DOCTYPE)
         html {
@@ -83,78 +73,14 @@ fn layout(content: Markup) -> Markup {
     }
 }
 
-#[instrument(skip(pool))]
-pub async fn index(State(pool): State<DbPool>) -> Html<String> {
-    info!("Index route called");
-    debug!("Getting database connection from pool");
-    let mut conn = pool.get().expect("Failed to get DB connection");
-
-    debug!("Loading messages from database");
-    let messages_list = messages::table
-        .order(messages::created_at.desc())
-        .limit(50)
-        .load::<Message>(&mut conn)
-        .expect("Error loading messages");
-
-    info!(
-        message_count = messages_list.len(),
-        "Messages loaded successfully"
-    );
-
+pub async fn index() -> Html<String> {
     let content = html! {
         h1 { "Echo Server" }
-
-        form method="post" action="/echo" {
-            textarea name="content" rows="5" placeholder="Type your message here..." required {}
-            br;
-            button type="submit" { "Send Echo" }
-        }
-
-        h2 { "Recent Messages" }
-
-        @for message in messages_list {
-            div.message {
-                div.message-content { (message.content) }
-                div.message-time {
-                    "Sent at: "
-                    @let time = message.created_at;
-                    (format!("{:?}", time))
-                }
-            }
+        p {
+            "Welcome to the Echo Server! "
+            a href="/echoes" { "View echoes" }
         }
     };
 
     Html(layout(content).into_string())
 }
-
-#[derive(Deserialize)]
-pub struct EchoForm {
-    content: String,
-}
-
-#[instrument(skip(pool, form), fields(content_length = form.content.len()))]
-pub async fn echo(State(pool): State<DbPool>, Form(form): Form<EchoForm>) -> Redirect {
-    info!("Echo route called");
-    debug!("Getting database connection from pool");
-    let mut conn = pool.get().expect("Failed to get DB connection");
-
-    let content_preview = if form.content.len() > 50 {
-        format!("{}...", &form.content[..50])
-    } else {
-        form.content.clone()
-    };
-    debug!(content_preview = %content_preview, "Preparing to save message");
-
-    let new_message = NewMessage {
-        content: form.content,
-    };
-
-    debug!("Inserting message into database");
-    diesel::insert_into(messages::table)
-        .values(&new_message)
-        .execute(&mut conn)
-        .expect("Error saving message");
-
-    info!("Message saved successfully, redirecting to index");
-    Redirect::to("/")
-}

src/main.rs

@@ -1,4 +1,5 @@
 mod db;
+mod echoes;
 mod handlers;
 mod models;
 mod schema;
@@ -38,7 +39,8 @@ async fn main() {
 
     let app = Router::new()
         .route("/", get(handlers::index))
-        .route("/echo", post(handlers::echo))
+        .route("/echoes", get(echoes::list))
+        .route("/echoes", post(echoes::create))
         .with_state(pool);
 
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();