Merge pull request #13 from beforesemicolon/develop

Develop
beforesemicolon · Jul 6, 2021 · d6f8e97 · d6f8e97
2 parents f308ade + 65693a2
commit d6f8e97
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/core/engine/page-and-resources-middleware.js b/core/engine/page-and-resources-middleware.js
@@ -82,12 +82,19 @@ function pageAndResourcesMiddleware(pagesRoutes, pagesDirectoryPath, {env, onPag
         return res.sendStatus(404);
       }
     } else if(!ext || ext === '.html') {
-      const template = pagesRoutes[req.path] ?? pagesRoutes[`${req.path}/`] ?? pagesRoutes['/404'];
+      const template = pagesRoutes[req.path] ?? pagesRoutes[`${req.path}/`];
 
       if (template) {
-        return res.render(template, onPageRequest(req) ?? {})
+        return res.render(template, onPageRequest(req) || {})
       } else if(!ext || ext === '.html') {
-        return res.send('<h1>404 - Page Not Found</h1>')
+
+        if (req.path.startsWith('/404')) {
+            return pagesRoutes['/404']
+              ? res.render(pagesRoutes['/404'])
+              : res.send('<h1>404 - Page Not Found</h1>')
+        }
+
+        return res.redirect('/404')
       }
     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@beforesemicolon/html-plus",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "HTML Template Engine/Language",
   "main": "dist/index.js",
   "files": [

diff --git a/website/pages/404.scss b/website/pages/404.scss
@@ -3,7 +3,9 @@
 
 .not-found {
   text-align: center;
-  padding: 50px 30%;
+  padding-top: 50px;
+  padding-bottom: 50px;
+  @include wrapper(350px);
 
   h2 {
     font-size: 3rem;

diff --git a/website/pages/learn/learn.scss b/website/pages/learn/learn.scss
@@ -1,10 +1,11 @@
 @import "../_sass/common";
 @import "../_partials/layout";
 
-
 .learn {
   text-align: center;
-  padding: 50px 30%;
+  padding-top: 50px;
+  padding-bottom: 50px;
+  @include wrapper(350px);
 
   h2 {
     font-size: 3rem;