minify all pages

src/main.rs

@@ -8,7 +8,9 @@ use actix_files::Files;
 use actix_web::{web, App, HttpServer};
 use glob::glob;
 use minify_html::{minify, Cfg};
+
 mod config;
+mod template;
 
 #[path = "routes/agreements.rs"]
 mod agreements;

src/routes/index.rs

@@ -1,6 +1,8 @@
 use actix_web::{get, HttpResponse, Responder};
 use askama::Template;
 
+use crate::template::render_html;
+
 #[get("/")]
 pub async fn page() -> impl Responder {
     HttpResponse::Ok().body(get_page())
@@ -11,7 +13,5 @@ pub async fn page() -> impl Responder {
 struct IndexTemplate {}
 
 pub fn get_page() -> std::string::String {
-    let index = IndexTemplate {};
+    render_html(&IndexTemplate {})
-
-    index.render().unwrap()
 }

src/routes/networks.rs

@@ -1,6 +1,8 @@
 use actix_web::{get, HttpResponse, Responder};
 use askama::Template;
 
+use crate::template::render_html;
+
 #[get("/networks")]
 pub async fn page() -> impl Responder {
     HttpResponse::Ok().body(get_page())
@@ -11,7 +13,5 @@ pub async fn page() -> impl Responder {
 struct NetworksTemplate {}
 
 pub fn get_page() -> std::string::String {
-    let index = NetworksTemplate {};
+    render_html(&NetworksTemplate {})
-
-    index.render().unwrap()
 }

src/routes/not_found.rs

@@ -1,6 +1,8 @@
 use actix_web::{HttpResponse, Responder};
 use askama::Template;
 
+use crate::template::render_html;
+
 pub async fn page() -> impl Responder {
     HttpResponse::NotFound().body(get_page())
 }
@@ -10,7 +12,5 @@ pub async fn page() -> impl Responder {
 struct Error404Template {}
 
 pub fn get_page() -> std::string::String {
-    let index = Error404Template {};
+    render_html(&Error404Template {})
-
-    index.render().unwrap()
 }

src/routes/portfolio.rs

@@ -1,6 +1,8 @@
 use actix_web::{get, HttpResponse, Responder};
 use askama::Template;
 
+use crate::template::render_html;
+
 #[get("/portfolio")]
 pub async fn page() -> impl Responder {
     HttpResponse::Ok().body(get_page())
@@ -11,7 +13,5 @@ pub async fn page() -> impl Responder {
 struct PortfolioTemplate {}
 
 pub fn get_page() -> std::string::String {
-    let index = PortfolioTemplate {};
+    render_html(&PortfolioTemplate {})
-
-    index.render().unwrap()
 }

src/template.rs

@@ -0,0 +1,9 @@
+use askama::DynTemplate;
+use minify_html::{minify, Cfg};
+
+pub fn render_html(template: &dyn DynTemplate) -> String {
+    let data = template.dyn_render().unwrap();
+
+    let cfg = Cfg::spec_compliant();
+    String::from_utf8(minify(data.as_bytes(), &cfg)).unwrap()
+}