2 files changed, 29 insertions, 25 deletions

diff --git a/app/middlewares/blogs.ts b/app/middlewares/blogs.ts
index 8fd07c6..e1f5433 100644
--- a/app/middlewares/blogs.ts
+++ b/app/middlewares/blogs.ts
@@ -1,17 +1,19 @@
 import { PageDirectory } from "../pages.js";
 
-export const blogs = ((req, res, next) => {
-    let blogs = [];
-    for (const page of Object.values(PageDirectory.pages)) {
-        if (page.route.startsWith('blog/')) {
-            blogs.push(page);
+export const blogs = (pageDirectory: PageDirectory) => {
+    return ((req, res, next) => {
+        let blogs = [];
+        for (const page of Object.values(pageDirectory.pages)) {
+            if (page.route.startsWith('blog/')) {
+                blogs.push(page);
+            }
         }
-    }
-    
-    blogs.sort((a, b) => {
-        return b.metadata.date.getTime() - a.metadata.date.getTime();
+        
+        blogs.sort((a, b) => {
+            return b.metadata.date.getTime() - a.metadata.date.getTime();
+        });
+        
+        res.locals.blogs = blogs;
+        next();
     });
-    
-    res.locals.blogs = blogs;
-    next();
-});
+}
diff --git a/app/middlewares/index.ts b/app/middlewares/index.ts
index 81431ca..b5fcd34 100644
--- a/app/middlewares/index.ts
+++ b/app/middlewares/index.ts
@@ -1,16 +1,18 @@
 import { PageDirectory } from "../pages.js";
 
-export const page = ((req, res, next) => {
-    const path = req.originalUrl == "/" ? 'index' : req.originalUrl.substring(1);
-    res.locals.path = path;
-
-    const page = PageDirectory.get(path);
+export const directory = (pageDirectory: PageDirectory) => {
+    return ((req, res, next) => {
+        const path = req.originalUrl == "/" ? 'index' : req.originalUrl.substring(1);
+        res.locals.path = path;
+    
+        const page = pageDirectory.get(path);
+        
+        if (!page) {
+            next();
+            return;
+        }
     
-    if (!page) {
+        res.locals.page = page;
         next();
-        return;
-    }
-
-    res.locals.page = page;
-    next();
-});
+    }); 
+}