From 18cc5f69129615850e48a995f7c3406b74d8d2f4 Mon Sep 17 00:00:00 2001
From: Leonardo Bishop <me@leonardobishop.com>
Date: Sat, 5 Aug 2023 21:11:48 +0100
Subject: Redesign website

---
 app/routes/page/router.ts | 47 ++++++++---------------------------------------
 1 file changed, 8 insertions(+), 39 deletions(-)

(limited to 'app/routes/page/router.ts')

diff --git a/app/routes/page/router.ts b/app/routes/page/router.ts
index dc819f8..5c0a39b 100644
--- a/app/routes/page/router.ts
+++ b/app/routes/page/router.ts
@@ -1,51 +1,20 @@
 import express from 'express';
-import { navbar, page } from '../../middlewares/index.js';
+import { page } from '../../middlewares/index.js';
 
 export const router = express.Router({ mergeParams: true });
 
-router.use('/:page.wiki', page);
 router.use('/:page?', page);
 
-router.get('/:page.wiki', (req, res, next) => {
-    const page = res.locals.page;
-
-    if (!page) {
-        next();
-        return;
-    }
-
-    res.type('text/plain');
-    res.send(page.raw).end();
-});
-
-router.get('/:page?', navbar, (req, res, next) => {
-    const page = res.locals.page;
-
+router.get('/:page?', (req, res, next) => {
+    let page = res.locals.page;
     if (!page) {
         next();
         return;
-    } 
-
-    let html: string;
-    let title: string;
-
-    if (page.metadata.errors.length != 0) {
-        html = '<div class="box-red">This page could not be built due to the following errors:<br><ul>'
-        page.metadata.errors.forEach(e => {
-            html += `<li>${e.identifier}: ${e.message}</li>`
-        });
-        html += '</ul>Go <a href="/">home</a>?</div>'
-        title = 'Page error'
-    } else {
-        html = page.html;
-        title = page.metadata.displayTitle;
     }
-
-    res.render('page.ejs', {
-        navbar: res.locals.navbarHtml,
-        path: res.locals.path,
-        content: html,
-        title: title,
-        buildTime: new Date(page.buildTime)
+    
+    res.render('index.ejs', {
+        content: page.html,
+        stylesheets: page.metadata.stylesheets,
+        scripts: page.metadata.scripts,
     });
 });
-- 
cgit v1.2.3-70-g09d2