Added database for projects

Cargo.toml

@@ -8,6 +8,6 @@ actix-web = {version = "4.11.0"}
 serde = "1.0.228"
 serde_json = "1.0.145"
 toml = "0.9.7"
-sqlx = {version = "0.8.6", features = ["postgres"]}
+sqlx = {version = "0.8.6", features = ["postgres", "runtime-tokio"]}
 futures-util = "0.3.31"
 clap = { version = "4.5.50", features = ["derive"] }

migrations/20251027081447_projects.sql

@@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS Projects (
+"id" TEXT NOT NULL,
+"title" TEXT NOT NULL,
+"description" TEXT NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS Project_Detail (
+"id" TEXT PRIMARY KEY NOT NULL,
+"title" TEXT NOT NULL,
+"git_url" TEXT NOT NULL,
+"git_title" TEXT NOT NULL,
+"description" TEXT NOT NULL
+)

migrations/20251027102341_website_project.sql

@@ -0,0 +1,13 @@
+INSERT INTO Projects ("id", "title", "description") VALUES (
+'website',
+'website',
+'This project is the website you currently are on.'
+);
+
+INSERT INTO Project_Detail ("id", "title", "git_url", "git_title", "description") VALUES (
+'website',
+'website',
+'https://git.aindustries.be/AINDUSTRIES/aindustries.be',
+'aindustries-be',
+'This project, the website you are on, is made in Rust such that all the pages are generated by code. <br> That is that each html element is represented by a struct which implements the Render trait (as in render the element to html). <br> As it is right now the system is not that impressive but I believe it can do amazing things in the future.'
+)

src/pages/projects.rs

@@ -3,9 +3,20 @@ use crate::html::layouts::Division;
 use crate::html::pages::BasePage;
 use crate::html::{Render, boxed_vec};
 use actix_web::{Responder, get, web};
+use actix_web::web::Data;
+use serde::Deserialize;
+use sqlx::query_as;
+use crate::AppState;
+
+#[derive(Deserialize)]
+struct Project {
+    id: String,
+    title: String,
+    description: String
+}
 
 #[get("/projects")]
-async fn projects() -> impl Responder {
+async fn projects(app_state: Data<AppState>) -> impl Responder {
     let title = Heading::builder().text("My projects").build();
     let desc = Heading::builder()
         .level(2)
@@ -14,37 +25,47 @@ async fn projects() -> impl Responder {
     (I've done a lot of small projects but they are not worth it.)",
         )
         .build();
-    let website_title = Heading::builder().text("Website").build();
+    let projects = match query_as!(Project, "SELECT id, title, description FROM Projects").fetch_all(&app_state.pool).await {
-    let website_desc = Paragraph::builder()
+        Ok(projects) => projects,
-        .classes(vec!["project-desc"])
+        Err(_) => {vec![]}
-        .text("This project is the website you currently are on.")
+    };
-        .build();
+    let items: Vec<Box<dyn Render>> = projects.into_iter().map(|p| {
-    let view = Anchor::builder()
+        let title = Heading::builder().text(p.title).build();
-        .classes(vec!["project-view"])
+        let description = Paragraph::builder().classes(vec!["project-desc"]).text(p.description).build();
-        .href("/projects/website")
+        let view = Anchor::builder().classes(vec!["project-view"]).href(format!("/projects/{}", p.id)).text("Learn More").build();
-        .text("Learn More")
-        .build();
         let info = Division::builder()
         .classes(vec!["project-info"])
-        .elements(boxed_vec![website_desc, view])
+        .elements(boxed_vec![description, view])
         .build();
-    let website = Division::builder()
+        Box::new(Division::builder()
         .classes(vec!["project"])
-        .elements(boxed_vec![website_title, info])
+        .elements(boxed_vec![title, info])
-        .build();
+        .build()) as Box<dyn Render>
+    }).collect();
     let css = Link::builder()
         .rel("stylesheet")
         .href("/static/css/projects.css")
         .build();
+    let mut body = boxed_vec![title, desc];
+    body.extend(items);
     let page = BasePage::builder()
         .title("Projects")
         .head(boxed_vec![css])
-        .body(boxed_vec![title, desc, website])
+        .body(body)
         .build();
     page.render()
 }
+
+#[derive(Deserialize)]
+struct ProjectDetail {
+    id: String,
+    title: String,
+    git_url: String,
+    git_title: String,
+    description: String
+}
 #[get("/projects/{project}")]
-async fn project(project: web::Path<String>) -> impl Responder {
+async fn project(project: web::Path<String>, app_state: Data<AppState>) -> impl Responder {
     let project = project.into_inner();
     let css = Link::builder()
         .rel("stylesheet")
@@ -54,25 +75,23 @@ async fn project(project: web::Path<String>) -> impl Responder {
         .title(format!("Project-{}", project))
         .head(boxed_vec![css])
         .build();
-    match project.as_str() {
+    let project = match query_as!(ProjectDetail, "SELECT * FROM Project_Detail WHERE id = $1", project).fetch_one(&app_state.pool).await {
-        "website" => {
+        Ok(project) => project,
-            let title = Heading::builder().text("Website").build();
+        Err(error) => {
+            // return not found page
+            eprintln!("Error fetching project: {:?}", error);
+            return page.render()
+        }
+    };
+    let title = Heading::builder().text(project.title).build();
     let gitea = Anchor::builder()
-                .href("https://git.aindustries.be/AINDUSTRIES/aindustries.be")
+        .href(project.git_url)
-                .text("aindustries-be")
+        .text(project.git_title)
         .build();
     let desc = Paragraph::builder().classes(vec!["description"]).text(
-                format!("This project, the website you are on, \
+        format!("{}<br><br> Wish to see more? Check out the gitea repository: {}", project.description, gitea.render()),
-            is made in Rust such that all the pages are generated by code.<br>\
-            That is that each html element is represented by a struct which implements the Render trait (as in render the element to html).<br>\
-            As it is right now the system is not that impressive but I believe it can do amazing things in the futur.<br>\
-            <br>\
-            Wish to see more? Check out the gitea repository: {}", gitea.render()),
     ).build();
     page.append_element_to_body(title);
     page.append_element_to_body(desc);
-        }
-        _ => {}
-    }
     page.render()
 }