profile photo fix

.gitignore

@@ -4,6 +4,5 @@ node_modules/
 # env
 .env
 
-# Test files:
-a.js
-db.js
+# Test files
+test.js

README.md

@@ -10,6 +10,7 @@ A Node.js based forum software.
 
 ### Extra
 Run `node util/reset` to **reset the database**, and run `node util/admin` for give admin perms to first member.
+Edit `config.json` for default themes of users...
 
 ## API
 Akf-forum has got an API for AJAX, other clients etc. And, you can learn about API in `util/APIDOCS.md`.
@@ -43,6 +44,7 @@ Akf-forum has got an API for AJAX, other clients etc. And, you can learn about A
 | Message count | 🟢 | MEDIUM |
 | Delete user | 🟢 | HIGH |
 | Undelete | 🟢 | MEDIUM |
+| PM | 🔴 | MEDIUM |
 | About me | 🔴 | LOW |
 | Edit user | 🔴 | HIGH |
 | IP ban | 🔴 | MEDIUM |
@@ -81,13 +83,13 @@ Akf-forum has got an API for AJAX, other clients etc. And, you can learn about A
 ### Other
 | To do | Is done? | Priority |
 | ----- | -------- | -------- |
-| Footer | 🔴 | LOW |
+| from form to AJAX | 🟢 | HIGH |
 | auto-scroll  | 🟢 | LOW |
 | Multi-theme support, black theme | 🟡 | LOW |
 | Search | 🔴 | MEDIUM |
 | Page support, support message limit correct | 🔴 | MEDIUM |
-| from form to AJAX | 🟢 | HIGH |
-
+| Locales | 🔴 | MEDIUM |
+| Footer | 🔴 | LOW |
 ## Major Version History
 - V3: New Theme
 - V2: Backend fix, mongoose is fixed. Really big fix.

config.json

@@ -0,0 +1,3 @@
+{
+    "def_theme": "default"
+}

index.js

@@ -1,5 +1,6 @@
-const { UserModel } = require("./models"),
+const { def_theme } = require("./config.json"),
         session = require('express-session'),
+        { UserModel } = require("./models"),
         bodyParser = require('body-parser'),
         port = process.env.PORT || 3000,
         mongoose = require("mongoose"),
@@ -17,7 +18,11 @@ app.set("view engine", "ejs");
 app.use(express.json());
 app.use(async (req, res, next) => {
         req.user = await UserModel.get(req.session.userid);
-        res.error = (type, error) => res.status(type).render("error", {user: req.user, type, error });
+        res.reply = (page, options = {}, status = 200) => res.status(status)
+                .render(page, { user: req.user, theme: req.user?.theme || def_theme, ...options });
+
+        res.error = (type, error) => res.reply("error", { type, error }, type);
+
         if (req.user?.deleted) {
                 req.session.destroy();
                 return res.error(403, "Your account has been deleted.");

models/User.js

@@ -1,5 +1,5 @@
 const mongoose = require("mongoose")
-
+const { def_theme } = require("../config.json");
 const schema = new mongoose.Schema({
     id: { type: String },
 
@@ -7,7 +7,8 @@ const schema = new mongoose.Schema({
     avatar: { type: String, default: "/images/guest.png" },
     time: { type: Date, default: Date.now },
     deleted: { type: Boolean, default: false },
-    admin: { type: Boolean, default: false }
+    admin: { type: Boolean, default: false },
+    theme: { type: String, default: def_theme }
 
 });
 

routes/.js

@@ -12,7 +12,7 @@ app.get("/", async (req, res) => {
         messages = await MessageModel.count({deleted:false}),
         user = req.user;
 
-    res.render("index", { mem, user, users, threads, messages })
+    res.reply("index", { mem, users, threads, messages })
 
 })
 

routes/admin.js

@@ -9,7 +9,7 @@ app.get("/", async (req, res) => {
 
     if (!user?.admin) return res.error(  403, "You have not got permissions for view to this page.");
 
-    res.render("admin", { user, user2: false })
+    res.reply("admin", {  user2: false })
 });
 
 

routes/login.js

@@ -3,7 +3,7 @@ const { Router } = require("express");
 const app = Router();
 const bcrypt = require("bcrypt");
 
-app.get("/", (req, res) => res.render("login",{redirect: req.query.redirect,user:null}));
+app.get("/", (req, res) => res.reply("login",{redirect: req.query.redirect,user:null}));
 
 app.post("/", async (req, res) => {
     req.session.userid = null;

routes/register.js

@@ -5,42 +5,35 @@ const rateLimit = require('express-rate-limit')
 
 const app = Router();
 
-app.get("/", (req, res) => res.render("register",{user:null}));
+app.get("/", (req, res) => res.reply("register", { user: null }));
 
 app.post("/", rateLimit({
-    windowMs: 24*60*60_000, max: 1, standardHeaders: true, legacyHeaders: false,
-    handler: (request, response, next, options) =>
-            response.error(options.statusCode, "You are begin ratelimited")
-           
+    windowMs: 24 * 60 * 60_000, max: 1, standardHeaders: true, legacyHeaders: false,
+    handler: (_r, response, _n, options) => response.error(options.statusCode, "You are begin ratelimited")
 }), async (req, res) => {
     req.session.userid = null;
 
 
-    let { username = null, password = null, avatar } = req.body;
+    let { username = null, password: body_pass = null, avatar } = req.body;
 
-    if (username && password) {
-        const user = await SecretModel.findOne({ username });
+    if (!username || !body_pass) return res.error(res, 400, "You forgot entering some values");
+    const user = await SecretModel.findOne({ username });
 
-        if (user)
-            res.error(res, 400, `We have got an user named ${username}!`)
-
-        else {
+    if (user) return res.error(res, 400, `We have got an user named ${username}!`)
 
 
-            const user2 = new UserModel({ name: req.body.username, avatar })
-            await user2.takeId()
-            await user2.save();
+    const user2 = new UserModel({ name: req.body.username })
+    if (avatar) user2.avatar = avatar;
+    await user2.takeId()
+    await user2.save();
 
-            const salt = await bcrypt.genSalt(10);
-            password = await bcrypt.hash(password, salt);
-            await SecretModel.create({ username, password, id: user2.id })
-            req.session.userid = user2.id;
+    const salt = await bcrypt.genSalt(10);
+    const password = await bcrypt.hash(body_pass, salt);
+    await SecretModel.create({ username, password, id: user2.id })
+    req.session.userid = user2.id;
 
-            res.redirect('/');
-        }
+    res.redirect('/');
 
-    } else
-        res.error(res, 400, "You forgot entering some values")
 
 
 })

routes/threads.js

@@ -6,19 +6,14 @@ const { ThreadModel, MessageModel } = require("../models")
 
 app.get("/", async (req, res) => {
 
-    const user = req.user;
+    const threads = await ThreadModel.find(req.user?.admin ? {} : { deleted: false }).limit(10);
 
-    const threads = await ThreadModel.find(user?.admin ? {} : { deleted: false }).limit(10);
-
-    return res.render("threads", { threads, user });
+    return res.reply("threads", { threads });
 });
 
 
 app.get("/create*", async (req, res) => {
-
-    const user = req.user
-    res.render("create_thread", { user })
-
+    res.reply("create_thread")
 });
 
 app.get("/:id", async (req, res) => {
@@ -31,13 +26,13 @@ app.get("/:id", async (req, res) => {
     if (thread && (user?.admin || !thread.deleted)) {
 
         const messages = await Promise.all(thread.messages.map(async id => {
-            const message = await MessageModel.get(id)           
+            const message = await MessageModel.get(id)
             return user?.admin || !message?.deleted ? message.toObject({ virtuals: true }) : null;
         }));
 
-        res.render("thread", { thread, messages, user,scroll:req.query.scroll || false });
+        res.reply("thread", { thread, messages, scroll: req.query.scroll || false });
     } else
-        res.error( 404, "We have not got this thread.");
+        res.error(404, "We have not got this thread.");
 });
 
 

routes/users.js

@@ -5,7 +5,7 @@ const { UserModel, MessageModel, ThreadModel } = require("../models");
 
 app.get("/", async ({ user }, res) => {
     const users = await UserModel.find(user?.admin ? {} : { deleted: false });
-    return res.render("users", { users, user })
+    return res.reply("users", { users })
 
 });
 
@@ -19,7 +19,7 @@ app.get("/:id", async (req, res) => {
 
         const message = await MessageModel.count({ "author.id": id });// this place was having problem. fixed
         const thread = await ThreadModel.count({ "author.id": id });
-        res.render("user", { user, member, counts: { message, thread } })
+        res.reply("user", { member, counts: { message, thread } })
     }
     else res.error(404, "We have not got this user.");
 

views/create_thread.ejs

@@ -3,10 +3,11 @@
 
 <%- include("extra/meta", {title: "Create thread!" }) %>
 
-  <link rel="stylesheet" href="/css/create_thread.css" />
 
   
 <body style="text-align: center;">
+  <link rel="stylesheet" href="/css/create_thread.css" />
+
   <%- include("extra/navbar") %>
 
 

views/thread.ejs

@@ -15,8 +15,8 @@
     <%= thread.title %>
   </h1>
 
-  <h2 style="display:inline;">By <a href=<%="/users/" + thread.author.id %>> <%= thread.author.name %></a>
-    <img class="circle" src=<%=thread.author.avatar %> alt=<%= thread.author.name %>>
+  <h2 style="display:inline;">By <a href="<%="/users/" + thread.author.id %>"> <%= thread.author.name %></a>
+    <img class="circle" src="<%=thread.author.avatar %>">
   </h2>
 
   <% if (user && !thread.deleted){ %>

views/user.ejs

@@ -10,7 +10,7 @@
   <ul>
     <li>
       <h1 style="color: #4d18e6;">Avatar:</h1>
-      <img style="width:256px;height:256px;" src=<%=member.avatar %> alt=<%= member.name %>>
+      <img style="width:256px;height:256px;" src="<%=member.avatar %>">
     </li>
 
     <li>
@@ -92,7 +92,7 @@
      
             if (response.deleted) return;
               alert("User is undeleted successfully!");
-    location.reload()
+              location.reload()
           });
     
     

views/users.ejs

@@ -12,9 +12,9 @@
   <div class="users">
   <% users.forEach(user=>{ %>
       <div class="user-box">
-        <img src="<%=user.avatar %>" class="user-box-img">
+        <img src="<%= user.avatar %>" class="user-box-img">
         <div class="user-box-title"> <a href="<%= user.getLink() %>">
-          <% if (user.deleted) { %> <span style="color: RED;">[DELETED]</span><% } %>
+        <% if (user.deleted) { %> <span style="color: RED;">[DELETED]</span><% } %>
           <%= user.name %></a></div>
       </div>
   <% }); %>