src/main.rs

@@ -13,8 +13,8 @@ use crate::routes::{
 mod config;
 mod template;
 
-mod utils;
 mod routes;
+mod utils;
 
 #[actix_web::main]
 async fn main() -> Result<()> {

src/routes/agreements.rs

@@ -1,4 +1,4 @@
-use crate::{config::Config, utils::misc::get_url, template::InfosPage};
+use crate::{config::Config, template::InfosPage, utils::misc::get_url};
 use actix_web::{get, http::header::ContentType, routes, web, HttpResponse, Responder};
 use cached::proc_macro::once;
 use ramhorns::Content;

src/routes/not_found.rs

@@ -4,8 +4,8 @@ use ramhorns::Content;
 
 use crate::{
     config::Config,
-    utils::misc::{get_url, Html},
     template::{InfosPage, NavBar},
+    utils::misc::{get_url, Html},
 };
 
 pub async fn page(config: web::Data<Config>) -> impl Responder {

src/routes/portfolio.rs

@@ -36,21 +36,12 @@ fn build_page(config: Config) -> String {
     let ext = ".md";
 
     // Get about
-    let about = read_file(
+    let about = read_file(format!("{projects_dir}/about.md"), MType::Generic);
-        format!("{projects_dir}/about.md"),
-        MType::Generic,
-    );
 
     // Get apps
     let apps = glob(&format!("{apps_dir}/*{ext}"))
         .unwrap()
-        .map(|e| {
+        .map(|e| read_file(e.unwrap().to_string_lossy().to_string(), MType::Portfolio).unwrap())
-            read_file(
-                e.unwrap().to_string_lossy().to_string(),
-                MType::Portfolio,
-            )
-            .unwrap()
-        })
         .collect::<Vec<File>>();
 
     let appdata = if apps.is_empty() {
@@ -62,13 +53,7 @@ fn build_page(config: Config) -> String {
     // Get archived apps
     let archived_apps = glob(&format!("{apps_dir}/archive/*{ext}"))
         .unwrap()
-        .map(|e| {
+        .map(|e| read_file(e.unwrap().to_string_lossy().to_string(), MType::Portfolio).unwrap())
-            read_file(
-                e.unwrap().to_string_lossy().to_string(),
-                MType::Portfolio,
-            )
-            .unwrap()
-        })
         .collect::<Vec<File>>();
 
     let archived_appdata = if archived_apps.is_empty() {

src/routes/web3.rs

@@ -3,8 +3,8 @@ use cached::proc_macro::once;
 
 use crate::{
     config::Config,
-    utils::misc::{make_kw, Html},
     template::InfosPage,
+    utils::misc::{make_kw, Html},
 };
 
 #[get("/web3")]