wall context

index.js

@@ -4,7 +4,6 @@ import { doInit } from "./routes/init.js";
 const app = express()
 const port = 3000;
 
-app.use(express.static('public'));
 app.set('view engine', 'ejs');
 app.enable('view cache');
 

public/index.css

@@ -190,4 +190,8 @@ form .header-big,
 
 h1 {
     font-size: 1.4em;
+}
+
+.link {
+    color: inherit;
 }

routes/comment.js

@@ -29,6 +29,7 @@ router.get('/:id', async (req, res, next) => {
             continue;
         }
         reply.comment = dat[0];
+        reply.comment.idOriginal = reply.comment.id;
         reply.comment.id = reply.childId;
         reply.comment.type = reply.childType;
     }

routes/init.js

@@ -2,6 +2,7 @@ import { importRouters } from "../lib.js";
 import multer from "multer";
 import cookieParser from "cookie-parser";
 import { initDb } from "../db.js";
+import express from "express";
 
 let db = await initDb();
 
@@ -89,8 +90,9 @@ async function doInit(app) {
 
     doAliases(app);
 
+    app.use(express.static('public'));
+    app.use('/uploads', express.static('uploads'));
     app.use(auther)
-
     app.use(initr)
 
     app.use('/api/form', upload.none());

routes/walls.js

@@ -38,21 +38,31 @@ router.get('/get/:type/:id/:num', async (req, res, next) => {
     ]);
 
     replies.splice(0, 0, {
-        childType: 'comment',
+        childType: req.params.type,
         childId: req.params.id
     })
 
+    //TODO: make iterator
     for (let reply of replies) {
+        if (reply.childType == 'hub') {
+            reply.comment = { type: reply.childType, id: reply.childId, content: `The ${reply.childId} hub.`, username: false, date: undefined };
+            continue;
+        } else if (reply.childType == 'users') {
+            reply.comment = { type: reply.childType, id: reply.childId, content: `User ${reply.childId}'s wall.`, username: false, date: undefined };
+            continue;
+        }
+
         let dat = await db.all('SELECT * FROM comment WHERE id = ?', [
             reply.childId
         ]);
+
         if (reply.childType != 'comment' || dat.length < 1) {
             reply.comment = 'fail';
             continue;
         }
         reply.comment = dat[0];
         reply.comment.type = reply.childType;
-        reply.comment.id = reply.childId;
+        //reply.comment.id = reply.childId;
     }
 
     let comment = replies.splice(0, 1)[0];

views/comment.ejs

@@ -1,7 +1,15 @@
 <div class='main'>
-    <h1 class="header-big"><%= username %></h1>
+    <h1 class="header-big">
+        <% if (username) { %>
+        <a class='link' href='/users/<%= username %>'><%= username %></a>
+        <% } else { %>
+        Context
+        <% } %>
+    </h1>
     <div><%= content %></div>
+    <% if (!isNaN(date * 1)) { %>
     <div class='sub'><b>Posted on</b> <%= new Date(date).toISOString() %> </div>
+    <% } %>
     <%- include ('vblock.ejs', {link: `/${type}/${id}`, icon: '/icon.svg', name: 'Original'}) %>
     <%- include ('vblock.ejs', {link: `/walls/get/${type}/${id}/0`, icon: '/icon.svg', name: 'Replies'}) %>
 </div>

views/form.ejs

@@ -10,9 +10,7 @@
         <%= kv.key %>
     </span>
     <% if (kv.type=='textarea' ) { %>
-    <textarea class='form-input' type="<%= kv.type %>" name="<%= kv.name %>">
+    <textarea class='form-input' type="<%= kv.type %>" name="<%= kv.name %>"><%= kv.default %></textarea>
-    <%= kv.default %>
-    </textarea>
     <% } else { %>
     <input class='form-input' type="<%= kv.type %>" name="<%= kv.name %>" <%- kv.type=='hidden' ? 'hidden' : '' %>
         value="<%= kv.default %>">

views/replies.ejs

@@ -4,7 +4,7 @@
 
 <div class='main'>
     <h1 class="header-big">Replies</h1>
-    <%- include ('vblock.ejs', {link: `${page - 1}`, icon: '/icon.svg', name: 'Previous'}) %>
+    <%- include ('vblock.ejs', {link: `${Math.max(page - 1,0)}`, icon: '/icon.svg', name: 'Previous'}) %>
     <%- include ('vblock.ejs', {link: `${page * 1 + 1}`, icon: '/icon.svg', name: 'Next'}) %>
 </div>
 <% if (page == 0) { %>
@@ -18,11 +18,11 @@
                 "type": "textarea",
                 "name": "post",
                 "default": ""
-            },
+            }, 
             {
                 "key": "Attachments",
                 "type": "file",
-                "name": "post",
+                "name": "file",
                 "default": ""
             },
             {