Formatted file
This commit is contained in:
@@ -1,18 +1,18 @@
|
|||||||
|
use crate::AppState;
|
||||||
use crate::html::elements::{Anchor, Heading, Link, Paragraph};
|
use crate::html::elements::{Anchor, Heading, Link, Paragraph};
|
||||||
use crate::html::layouts::Division;
|
use crate::html::layouts::Division;
|
||||||
use crate::html::pages::BasePage;
|
use crate::html::pages::BasePage;
|
||||||
use crate::html::{Render, boxed_vec};
|
use crate::html::{Render, boxed_vec};
|
||||||
use actix_web::{Responder, get, web};
|
|
||||||
use actix_web::web::Data;
|
use actix_web::web::Data;
|
||||||
|
use actix_web::{Responder, get, web};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use sqlx::query_as;
|
use sqlx::query_as;
|
||||||
use crate::AppState;
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct Project {
|
struct Project {
|
||||||
id: String,
|
id: String,
|
||||||
title: String,
|
title: String,
|
||||||
description: String
|
description: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/projects")]
|
#[get("/projects")]
|
||||||
@@ -25,23 +25,40 @@ async fn projects(app_state: Data<AppState>) -> impl Responder {
|
|||||||
(I've done a lot of small projects but they are not worth it.)",
|
(I've done a lot of small projects but they are not worth it.)",
|
||||||
)
|
)
|
||||||
.build();
|
.build();
|
||||||
let projects = match query_as!(Project, "SELECT id, title, description FROM Projects").fetch_all(&app_state.pool).await {
|
let projects = match query_as!(Project, "SELECT id, title, description FROM Projects")
|
||||||
|
.fetch_all(&app_state.pool)
|
||||||
|
.await
|
||||||
|
{
|
||||||
Ok(projects) => projects,
|
Ok(projects) => projects,
|
||||||
Err(_) => {vec![]}
|
Err(_) => {
|
||||||
|
vec![]
|
||||||
|
}
|
||||||
};
|
};
|
||||||
let items: Vec<Box<dyn Render>> = projects.into_iter().map(|p| {
|
let items: Vec<Box<dyn Render>> = projects
|
||||||
let title = Heading::builder().text(p.title).build();
|
.into_iter()
|
||||||
let description = Paragraph::builder().classes(vec!["project-desc"]).text(p.description).build();
|
.map(|p| {
|
||||||
let view = Anchor::builder().classes(vec!["project-view"]).href(format!("/projects/{}", p.id)).text("Learn More").build();
|
let title = Heading::builder().text(p.title).build();
|
||||||
let info = Division::builder()
|
let description = Paragraph::builder()
|
||||||
.classes(vec!["project-info"])
|
.classes(vec!["project-desc"])
|
||||||
.elements(boxed_vec![description, view])
|
.text(p.description)
|
||||||
.build();
|
.build();
|
||||||
Box::new(Division::builder()
|
let view = Anchor::builder()
|
||||||
.classes(vec!["project"])
|
.classes(vec!["project-view"])
|
||||||
.elements(boxed_vec![title, info])
|
.href(format!("/projects/{}", p.id))
|
||||||
.build()) as Box<dyn Render>
|
.text("Learn More")
|
||||||
}).collect();
|
.build();
|
||||||
|
let info = Division::builder()
|
||||||
|
.classes(vec!["project-info"])
|
||||||
|
.elements(boxed_vec![description, view])
|
||||||
|
.build();
|
||||||
|
Box::new(
|
||||||
|
Division::builder()
|
||||||
|
.classes(vec!["project"])
|
||||||
|
.elements(boxed_vec![title, info])
|
||||||
|
.build(),
|
||||||
|
) as Box<dyn Render>
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
let css = Link::builder()
|
let css = Link::builder()
|
||||||
.rel("stylesheet")
|
.rel("stylesheet")
|
||||||
.href("/static/css/projects.css")
|
.href("/static/css/projects.css")
|
||||||
@@ -62,7 +79,7 @@ struct ProjectDetail {
|
|||||||
title: String,
|
title: String,
|
||||||
git_url: String,
|
git_url: String,
|
||||||
git_title: String,
|
git_title: String,
|
||||||
description: String
|
description: String,
|
||||||
}
|
}
|
||||||
#[get("/projects/{project}")]
|
#[get("/projects/{project}")]
|
||||||
async fn project(project: web::Path<String>, app_state: Data<AppState>) -> impl Responder {
|
async fn project(project: web::Path<String>, app_state: Data<AppState>) -> impl Responder {
|
||||||
@@ -75,12 +92,19 @@ async fn project(project: web::Path<String>, app_state: Data<AppState>) -> impl
|
|||||||
.title(format!("Project-{}", project))
|
.title(format!("Project-{}", project))
|
||||||
.head(boxed_vec![css])
|
.head(boxed_vec![css])
|
||||||
.build();
|
.build();
|
||||||
let project = match query_as!(ProjectDetail, "SELECT * FROM Project_Detail WHERE id = $1", project).fetch_one(&app_state.pool).await {
|
let project = match query_as!(
|
||||||
|
ProjectDetail,
|
||||||
|
"SELECT * FROM Project_Detail WHERE id = $1",
|
||||||
|
project
|
||||||
|
)
|
||||||
|
.fetch_one(&app_state.pool)
|
||||||
|
.await
|
||||||
|
{
|
||||||
Ok(project) => project,
|
Ok(project) => project,
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
// return not found page
|
// return not found page
|
||||||
eprintln!("Error fetching project: {:?}", error);
|
eprintln!("Error fetching project: {:?}", error);
|
||||||
return page.render()
|
return page.render();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let title = Heading::builder().text(project.title).build();
|
let title = Heading::builder().text(project.title).build();
|
||||||
@@ -88,9 +112,14 @@ async fn project(project: web::Path<String>, app_state: Data<AppState>) -> impl
|
|||||||
.href(project.git_url)
|
.href(project.git_url)
|
||||||
.text(project.git_title)
|
.text(project.git_title)
|
||||||
.build();
|
.build();
|
||||||
let desc = Paragraph::builder().classes(vec!["description"]).text(
|
let desc = Paragraph::builder()
|
||||||
format!("{}<br><br> Wish to see more? Check out the gitea repository: {}", project.description, gitea.render()),
|
.classes(vec!["description"])
|
||||||
).build();
|
.text(format!(
|
||||||
|
"{}<br><br> Wish to see more? Check out the gitea repository: {}",
|
||||||
|
project.description,
|
||||||
|
gitea.render()
|
||||||
|
))
|
||||||
|
.build();
|
||||||
page.append_element_to_body(title);
|
page.append_element_to_body(title);
|
||||||
page.append_element_to_body(desc);
|
page.append_element_to_body(desc);
|
||||||
page.render()
|
page.render()
|
||||||
|
|||||||
Reference in New Issue
Block a user