Renamed HTMX files (#40)

.github/workflows/rust.yml

@@ -2,21 +2,20 @@ name: Rust
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   CARGO_TERM_COLOR: always
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Build
-      run: cargo build --verbose
-    - name: Run tests
-      run: cargo test --verbose
+      - uses: actions/checkout@v3
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose

api/src/handlers/base.rs

@@ -17,7 +17,9 @@ pub async fn root_path() -> impl IntoResponse {
 pub async fn get_houses_web(State(database): State<Arc<AppState>>) -> impl IntoResponse {
     let list_houses = HouseEntity::find().all(&database.db).await.unwrap();
 
-    Records { houses: list_houses }
+    Records {
+        houses: list_houses,
+    }
 }
 
 pub async fn create_house_web(
@@ -31,7 +33,9 @@ pub async fn create_house_web(
         ..Default::default()
     };
     let insert_response = new_house.insert(&database.db).await.unwrap();
-    HouseNewTemplate { house: insert_response };
+    HouseNewTemplate {
+        house: insert_response,
+    };
 }
 
 #[derive(Template)]

api/src/handlers/room.rs

@@ -8,7 +8,7 @@ use entity::room::Entity as RoomEntity;
 use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter, Set};
 use uuid::Uuid;
 
-use crate::models::room::{Room, CreateRoom};
+use crate::models::room::{CreateRoom, Room};
 
 // Todo - Fix internal server error
 pub async fn list_rooms(

api/src/lib.rs

@@ -1,32 +1,34 @@
-use std::sync::Arc;
 use anyhow::Ok;
 use axum::serve;
 use migration::{Migrator, MigratorTrait};
 use sea_orm::{Database, DatabaseConnection};
+use std::sync::Arc;
 use tokio::net::TcpListener;
 
-pub mod routes;
 pub mod handlers;
 pub mod models;
+pub mod routes;
 
 pub struct AppState {
-  db: DatabaseConnection,
+    db: DatabaseConnection,
 }
 
 #[tokio::main]
 async fn start() -> anyhow::Result<()> {
     dotenv::dotenv()?;
     let database_uri = dotenvy::var("DATABASE_URL")?;
     let db_connection = Database::connect(database_uri)
-      .await
-      .expect("Database connection failed");
+        .await
+        .expect("Database connection failed");
 
     Migrator::up(&db_connection, None).await?;
 
     // Initialize tracing
     tracing_subscriber::fmt::init();
 
-    let app = routes::create_routes(Arc::new(AppState { db: db_connection.clone() }));
+    let app = routes::create_routes(Arc::new(AppState {
+        db: db_connection.clone(),
+    }));
 
     let listener = TcpListener::bind(&"0.0.0.0:3000").await.unwrap();
     serve(listener, app).await?;
@@ -35,9 +37,9 @@ async fn start() -> anyhow::Result<()> {
 }
 
 pub fn main() {
-  let result = start();
+    let result = start();
 
-  if let Some(err) = result.err() {
-    println!("Error: {err}");
-  }
+    if let Some(err) = result.err() {
+        println!("Error: {err}");
+    }
 }

api/src/models/house.rs

@@ -17,22 +17,21 @@ pub struct CreateHouse {
 }
 
 pub struct DeleteResponse {
-  pub success: bool,
-  pub message: String,
+    pub success: bool,
+    pub message: String,
 }
 
-
 // validations
 impl CreateHouse {
-  pub fn validate(&self) -> Result<(), String> {
-      if self.title.trim().is_empty() {
-          return Err("Name is empty".to_string());
-      }
-      if self.body.trim().is_empty() {
-          return Err("Description is empty".to_string());
-      }
-      Ok(())
-  }
+    pub fn validate(&self) -> Result<(), String> {
+        if self.title.trim().is_empty() {
+            return Err("Name is empty".to_string());
+        }
+        if self.body.trim().is_empty() {
+            return Err("Description is empty".to_string());
+        }
+        Ok(())
+    }
 }
 
 // impl NewHouse {

api/src/models/item.rs

@@ -11,7 +11,7 @@ pub struct Item {
     pub category: String,
     pub purchase_date: String,
     pub expiry_date: Option<String>,
-    pub value: f64
+    pub value: f64,
 }
 
 /// New Item.
@@ -23,7 +23,7 @@ pub struct NewItem {
     pub category: String,
     pub purchase_date: String,
     pub expiry_date: Option<String>,
-    pub value: f64
+    pub value: f64,
 }
 
 #[derive(Deserialize)]
@@ -33,10 +33,10 @@ pub struct ItemQuery {
 
 // validations
 impl NewItem {
-  pub fn validate(&self) -> Result<(), String> {
-      if self.name.trim().is_empty() {
-          return Err("Name is empty".to_string());
-      }
-      Ok(())
-  }
+    pub fn validate(&self) -> Result<(), String> {
+        if self.name.trim().is_empty() {
+            return Err("Name is empty".to_string());
+        }
+        Ok(())
+    }
 }

api/src/models/room.rs

@@ -23,10 +23,10 @@ pub struct CreateRoom {
 
 // validations
 impl CreateRoom {
-  pub fn validate(&self) -> Result<(), String> {
-      if self.name.trim().is_empty() {
-          return Err("Name is empty".to_string());
-      }
-      Ok(())
-  }
+    pub fn validate(&self) -> Result<(), String> {
+        if self.name.trim().is_empty() {
+            return Err("Name is empty".to_string());
+        }
+        Ok(())
+    }
 }

api/templates/base.html

@@ -1,14 +1,20 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
-  <script src="https://unpkg.com/[email protected]" integrity="sha384-FhXw7b6AlE/jyjlZH5iHa/tTe9EpJ1Y55RjcgPbjeWMskSxZt1v9qkxLJWNJaGni" crossorigin="anonymous"></script>
-  <link rel="stylesheet" href="/styles.css"/>
-  <title>{% block title %}{{ title }} - My Site{% endblock %}</title>
+    <script
+      src="https://unpkg.com/[email protected]"
+      integrity="sha384-FhXw7b6AlE/jyjlZH5iHa/tTe9EpJ1Y55RjcgPbjeWMskSxZt1v9qkxLJWNJaGni"
+      crossorigin="anonymous"
+    ></script>
+    <link rel="stylesheet" href="/styles.css" />
+    <title>{% block title %}{{ title }} - My Site{% endblock %}</title>
     {% block head %}{% endblock %}
   </head>
   <body>
     <div id="content">
-      {% block content %}<p>Placeholder content</p>{% endblock %}
+      {% block content %}
+      <p>Placeholder content</p>
+      {% endblock %}
     </div>
   </body>
 </html>

api/templates/house.html

@@ -1,8 +1,15 @@
 <tr id="shuttle-house-{{ house.id }}">
-	<td> {{ house.id }} </td>
-	<td id="shuttle-house-desc-{{house.id}}"> {{ house.title }} </td>
-  <td id="shuttel-house-body={{house.id}}"> {{ house.body }}</td>
-	<td>
-    <button hx-delete="/houses/{{house.id}}" hx-trigger="click" hx-target="#shuttle-todo-{{house.id}}" hx-swap="delete">Delete</button>
-  </td>
+    <td>{{ house.id }}</td>
+    <td id="shuttle-house-desc-{{house.id}}">{{ house.title }}</td>
+    <td id="shuttel-house-body={{house.id}}">{{ house.body }}</td>
+    <td>
+        <button
+            hx-delete="/houses/{{house.id}}"
+            hx-trigger="click"
+            hx-target="#shuttle-todo-{{house.id}}"
+            hx-swap="delete"
+        >
+            Delete
+        </button>
+    </td>
 </tr>

api/templates/houses.html

@@ -9,9 +9,7 @@
       </tr>
     </thead>
     <tbody id="houses-content">
-      {% for house in houses %}
-      {% include "house.html" %}
-      {% endfor %}
+      {% for house in houses %} {% include "house.html" %} {% endfor %}
     </tbody>
   </table>
 </div>

api/templates/index.html

@@ -1,15 +1,25 @@
-{% extends "base.html" %}
-
-{% block title %}Index{% endblock %}
-
-{% block content %}
+{% extends "base.html" %} {% block title %}Index{% endblock %} {% block content
+%}
 <h1>Inventory App</h1>
 <form id="add-form">
-  <input placeholder="Your House name" required type=text name="title">
-  <input placeholder="Description" required type=text name="body">
-  <button hx-post="/houses" hx-trigger="click" hx-target="#houses-content" hx-swap="beforeend">Add</button>
+  <input placeholder="Your House name" required type="text" name="title" />
+  <input placeholder="Description" required type="text" name="body" />
+  <button
+    hx-post="/houses"
+    hx-trigger="click"
+    hx-target="#houses-content"
+    hx-swap="beforeend"
+  >
+    Add
+  </button>
 </form>
-<div id="list" hx-get="/houses" hx-target="this" hx-trigger="load" hx-swap="outerHTML">
+<div
+  id="list"
+  hx-get="/houses"
+  hx-target="this"
+  hx-trigger="load"
+  hx-swap="outerHTML"
+>
   Loading...
 </div>
 {% endblock %}

api/templates/styles.css

@@ -1,11 +1,13 @@
 #content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	gap: 1rem;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 1rem;
 }
 
-table, th, td {
+table,
+th,
+td {
   border: 1px solid black;
-	padding: 0.25rem;
+  padding: 0.25rem;
 }

src/main.rs

@@ -1,3 +1,3 @@
 fn main() {
-  inventory_api::main();
+    inventory_api::main();
 }