feat: load jobs on load from database

Author: SilenLoc

Cargo.lock

@@ -9,7 +9,7 @@ authors = ["rust Basel", "all its members"]
 axum = { version = "0.8.4", features = ["macros"] }
 env_logger = "0.11.8"
 log = "0.4.27"
-maud = "0.27.0"
+maud = { version = "0.27.0", features = ["axum"] }
 mime = "0.3.17"
 tokio = { version = "1.45.0", features = ["macros", "rt-multi-thread", "signal"] }
 serde = { version = "1.0.219", features = ["derive"] }

Cargo.toml

@@ -4,6 +4,7 @@ use crate::http_types::{ox_css, ox_js};
 
 pub mod basel;
 pub mod daisy;
+pub mod htmx;
 pub mod tailwind;
 pub mod themes;
 
@@ -22,6 +23,7 @@ async fn assets(Path(file): Path<String>) -> impl IntoResponse {
         "daisy.css" => daisy::CSS,
         "tw.js" => tailwind::JS,
         "themes.css" => basel::CSS,
+        "htmx.js" => htmx::JS,
         _ => "",
     };
 

data/dev.db

@@ -6,9 +6,11 @@ use axum::{
     routing::get,
 };
 use log::{error, info};
+use maud::{Markup, html};
 
 use crate::{
-    model::{JobId, Limit},
+    jobs::job_card,
+    model::{Job, JobId, Limit},
     repository::JobRepo,
 };
 pub fn router() -> Router {
@@ -21,10 +23,10 @@ pub fn router() -> Router {
 pub async fn get_jobs(repo: Extension<JobRepo>, limit: Query<Limit>) -> impl IntoResponse {
     let limit: Limit = *limit;
     match repo.get_page(limit).await {
-        Ok(_jobs) => (
+        Ok(jobs) => (
             StatusCode::OK,
             // todo return new view
-            Ok(""),
+            Ok(html!((jobs_view(jobs)))),
         ),
         Err(err) => {
             error!("Failed to get a page of jobs: {err}\n{:?}", err.source());
@@ -33,6 +35,21 @@ pub async fn get_jobs(repo: Extension<JobRepo>, limit: Query<Limit>) -> impl Int
     }
 }
 
+pub fn jobs_view(jobs: Vec<Job>) -> Markup {
+    html! {
+        @for job in jobs{
+            (job_card(job.title(), job.preface(), vec![html!{
+                div class="badge badge-accent" {
+                    "On-site"
+                }
+            }], job.description(), html!{
+                a class="btn btn-secondary btn-sm bg-base" href=(job.uri()) {
+                "Apply"
+            }}))
+        }
+    }
+}
+
 pub async fn get_job(repo: Extension<JobRepo>, job_id: Path<JobId>) -> impl IntoResponse {
     info!("Got job {}?", *job_id);
     match repo.get_one(*job_id).await {

src/assets/htmx.rs

@@ -11,6 +11,7 @@ pub fn ui() -> Markup {
     (maud::DOCTYPE)
     html data-theme="rust-ember" {
         head {
+            script src="/_assets/htmx.js" {}
             script src="/_assets/tw.js" {}
             link href="/_assets/daisy.css" rel="stylesheet" type="text/css";
             link href="/_assets/themes.css" rel="stylesheet" type="text/css";
@@ -43,17 +44,23 @@ pub fn ui() -> Markup {
                     ))
                 }
 
+
                 div class="grid gap-6 md:grid-cols-2 lg:grid-cols-3 mx-3" {
 
-               (job_card("Krypto Eng.", "Write the new app layers", vec![html!{
-                   div class="badge badge-accent" {
-                       "On-site"
-                   }
-               }], "This job is great because lorem ipsum", html!{
-                   button class="btn btn-secondary btn-sm bg-base" {
-                   "Apply"
-               }}))
+
+
+               div hx-get="/jobs" hx-trigger="load" {
+
+               }
+            }
             }
+
+            // example job
+            form hx-put="/api/jobs" hx-trigger="load" hx-target="null" {
+                input type="hidden" id="uri" name="uri" value="https://rust-basel.ch" {}
+                input type="hidden" id="title" name="title" value="https://rust-basel.ch" {}
+                input type="hidden" id="preface" name="preface" value="https://rust-basel.ch" {}
+                input type="hidden" id="description" name="description" value="https://rust-basel.ch" {}
             }
         }
     }

src/assets/mod.rs

@@ -57,6 +57,24 @@ pub struct Job {
     pub description: Option<String>,
 }
 
+impl Job {
+    pub fn title(&self) -> String {
+        self.title.clone().unwrap_or(String::new())
+    }
+
+    pub fn preface(&self) -> String {
+        self.preface.clone().unwrap_or(String::new())
+    }
+
+    pub fn description(&self) -> String {
+        self.description.clone().unwrap_or(String::new())
+    }
+
+    pub fn uri(&self) -> String {
+        self.uri.to_string()
+    }
+}
+
 #[derive(Debug, Copy, Clone, Deserialize)]
 pub struct Limit {
     pub page_size: Option<u8>,

src/jobs/job_card.rs

@@ -61,21 +61,19 @@ impl OxApp {
             shutdown,
         } = self;
         let routes = Router::new()
+            .merge(health::router())
+            .merge(jobs::router())
+            .merge(assets::router())
             .route("/api/jobs", put(crate::handlers::create_job))
             .route("/api/jobs/{job_id}", post(crate::handlers::update_job))
             .route("/api/jobs/{job_id}", delete(crate::handlers::delete_job))
             .layer(Extension(repo));
 
-        let wiht_view = routes
-            .merge(health::router())
-            .merge(jobs::router())
-            .merge(assets::router());
-
         let listener = TcpListener::bind(socket_addr)
             .await
             .context("failed to bind socket")?;
         info!("server bound to {socket_addr}");
-        let serve = axum::serve(listener, wiht_view);
+        let serve = axum::serve(listener, routes);
         tokio::select!(
             serve = serve => match serve {
                 Ok(()) => {