Updated pages to use the changed html elements
This commit is contained in:
@@ -6,33 +6,38 @@ use crate::html::{Page, Render};
|
||||
use actix_web::{Responder, get};
|
||||
|
||||
pub(crate) struct BasePage {
|
||||
page: Page
|
||||
page: Page,
|
||||
}
|
||||
|
||||
impl BasePage {
|
||||
pub(crate) fn new(title: &'static str) -> Self {
|
||||
pub(crate) fn new<T>(title: T) -> Self
|
||||
where
|
||||
T: Into<String>,
|
||||
{
|
||||
let mut page = Page::new(title);
|
||||
// header
|
||||
let mut header = div::new("header", vec!["header"]);
|
||||
let name = p::new("name", vec!["name"], "AINDUSTRIES".to_string());
|
||||
let name = p::new("name", vec!["name"], "AINDUSTRIES");
|
||||
let mut buttons = div::new("buttons", vec!["nav-buttons"]);
|
||||
let home = a::new("home", vec!["nav-button"], "/", "Home".to_string());
|
||||
let projects = a::new("projects", vec!["nav-button"], "/projects", "Projects".to_string());
|
||||
let home = a::new("home", vec!["nav-button"], "/", "Home");
|
||||
let projects = a::new("projects", vec!["nav-button"], "/projects", "Projects");
|
||||
buttons.append_element(home);
|
||||
buttons.append_element(projects);
|
||||
header.append_element(name);
|
||||
header.append_element(buttons);
|
||||
// background
|
||||
let image = img::new("background", vec!["background"], "static/img/background.png");
|
||||
let image = img::new(
|
||||
"background",
|
||||
vec!["background"],
|
||||
"/static/img/background.png",
|
||||
);
|
||||
// css
|
||||
let base = link::new("stylesheet", "static/css/base.css");
|
||||
let base = link::new("stylesheet", "/static/css/base.css");
|
||||
// add elements to the page in order
|
||||
page.append_element_to_head(base);
|
||||
page.append_element_to_body(image);
|
||||
page.append_element_to_body(header);
|
||||
Self {
|
||||
page
|
||||
}
|
||||
Self { page }
|
||||
}
|
||||
|
||||
pub(crate) fn append_element_to_head(&mut self, element: impl Render + 'static) {
|
||||
@@ -54,10 +59,12 @@ async fn index() -> impl Responder {
|
||||
let mut page = BasePage::new("AINDUSTRIES");
|
||||
// introduction
|
||||
let mut intro = div::new("intro", vec!["intro"]);
|
||||
let hi = h1::new("Hello and welcome!".to_string());
|
||||
let detail = h2::new("This here is a small website to show the passion I have for computers.<br>\
|
||||
let hi = h1::new("Hello and welcome!");
|
||||
let detail = h2::new(
|
||||
"This here is a small website to show the passion I have for computers.<br>\
|
||||
I have always had a good time creating and discovering new things.<br>\
|
||||
Your may discover some of my projects here on this showcase.".to_string());
|
||||
Your may discover some of my projects here on this showcase.",
|
||||
);
|
||||
intro.append_element(hi);
|
||||
intro.append_element(detail);
|
||||
// css
|
||||
|
||||
@@ -1,25 +1,64 @@
|
||||
use actix_web::{get, Responder};
|
||||
use crate::html::elements::{div, h1, p, a, link};
|
||||
use crate::html::{Render};
|
||||
use super::BasePage;
|
||||
use crate::html::Render;
|
||||
use crate::html::elements::{a, div, h1, h2, link, p};
|
||||
use actix_web::{Responder, get, web};
|
||||
|
||||
#[get("/projects")]
|
||||
async fn projects() -> impl Responder {
|
||||
let mut page = BasePage::new("Projects");
|
||||
let title = h1::new("My projects");
|
||||
let desc = h2::new(
|
||||
"Here you will find all my projects which deserve to be shown<br>\
|
||||
(I've done a lot of small projects but they are not worth it.)",
|
||||
);
|
||||
let mut website = div::new("project-website", vec!["project"]);
|
||||
let title = h1::new("Website".to_string());
|
||||
let desc = p::new("website-desc", vec!["project-desc"], "This project is the website you are currently on.".to_string());
|
||||
let view = a::new("website-view", vec!["project-view"], "website" , "View More".to_string());
|
||||
website.append_element(title);
|
||||
website.append_element(desc);
|
||||
website.append_element(view);
|
||||
let website_title = h1::new("Website");
|
||||
let mut info = div::new("project-website-info", vec!["project-info"]);
|
||||
let website_desc = p::new(
|
||||
"website-desc",
|
||||
vec!["project-desc"],
|
||||
"This project is the website you currently are on.",
|
||||
);
|
||||
let view = a::new(
|
||||
"website-view",
|
||||
vec!["project-view"],
|
||||
"/projects/website",
|
||||
"Learn More",
|
||||
);
|
||||
info.append_element(website_desc);
|
||||
info.append_element(view);
|
||||
website.append_element(website_title);
|
||||
website.append_element(info);
|
||||
let css = link::new("stylesheet", "/static/css/projects.css");
|
||||
page.append_element_to_head(css);
|
||||
page.append_element_to_body(title);
|
||||
page.append_element_to_body(desc);
|
||||
page.append_element_to_body(website);
|
||||
page.render()
|
||||
}
|
||||
#[get("/projects/{project}")]
|
||||
async fn project() -> impl Responder {
|
||||
let page = BasePage::new("Project");
|
||||
async fn project(project: web::Path<String>) -> impl Responder {
|
||||
let project = project.into_inner();
|
||||
let mut page = BasePage::new(format!("Project-{}", project));
|
||||
match project.as_str() {
|
||||
"website" => {
|
||||
let title = h1::new("Website");
|
||||
let desc = p::new(
|
||||
"description",
|
||||
vec!["description"],
|
||||
"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 futur.<br>\
|
||||
<br>\
|
||||
Wish to see more? Check out the gitea repository: ",
|
||||
);
|
||||
page.append_element_to_body(title);
|
||||
page.append_element_to_body(desc);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
let css = link::new("stylesheet", "/static/css/project.css");
|
||||
page.append_element_to_head(css);
|
||||
page.render()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user