From 8fe083ded06239f5bff68370a560cd5b8739ffae Mon Sep 17 00:00:00 2001
From: Akif9748 <akif9748@gmail.com>
Date: Fri, 26 May 2023 12:02:46 +0300
Subject: [PATCH] Online users support and new messages on mainpage

---
 README.md                                    |  2 +-
 src/routes/.js                               | 23 ++++++---
 src/themes/bootstrap_black/views/index.ejs   | 50 ++++++++------------
 src/themes/bootstrap_black/views/threads.ejs |  1 -
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 0391f07..397491e 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Akf-forum has got an API for AJAX (fetch), other clients etc. And, you can learn
 - send public to common/public
 - user.ejs for per theme
 - categori search title like thread search
-
+- edit template 
 ### front-end
 - working reset button
 - better pagination
diff --git a/src/routes/.js b/src/routes/.js
index 6ad6c8f..d3d62b4 100644
--- a/src/routes/.js
+++ b/src/routes/.js
@@ -4,13 +4,24 @@ const app = Router();
 
 app.get("/", async (req, res) => {
 
-    const categories = await CategoryModel.count(),
-        users = await UserModel.count({ deleted: false }),
-        threads = await ThreadModel.count({ state: "OPEN" }),
-        messages = await MessageModel.count({ deleted: false }),
-        newestMember = await UserModel.findOne({ deleted: false }, "name").sort({ time: -1 });
+    const [
+        categories, users, threads, messages, newestMember, newestMessages, onlineUserCount, onlineUsers
+    ] = await Promise.all([
+        CategoryModel.count(),
+        UserModel.count({ deleted: false }),
+        ThreadModel.count({ state: "OPEN" }),
+        MessageModel.count({ deleted: false }),
+        UserModel.findOne({ deleted: false }, "name id").sort({ time: -1 }),
+        MessageModel.find({ deleted: false }).sort({ time: -1 }).limit(10),
+        UserModel.count({ deleted: false, lastSeen: { $gt: Date.now() - 1000 * 60 * 5 } }),
+        UserModel.find({ deleted: false, hideLastSeen: false, lastSeen: { $gt: Date.now() - 1000 * 60 * 5 } }, "name id")
+    ])
 
-    res.reply("index", { categories, users, threads, messages, newestMember: newestMember.name });
+
+    res.reply("index", {
+        categories, users, threads, messages,
+        newestMember, newestMessages, onlineUserCount, onlineUsers
+    });
 
 });
 
diff --git a/src/themes/bootstrap_black/views/index.ejs b/src/themes/bootstrap_black/views/index.ejs
index e40446d..8ffbfba 100644
--- a/src/themes/bootstrap_black/views/index.ejs
+++ b/src/themes/bootstrap_black/views/index.ejs
@@ -22,34 +22,31 @@
       <div class="col-12 col-xl-9">
         <div class="category">
 
-          <h2 class="h4 text-white  bg-danger mb-0 p-4 rounded-top">Forum category</h2>
+          <h2 class="h4 text-white  bg-danger mb-0 p-4 rounded-top">New messages</h2>
           <table class="table table-striped table-bordered table-responsive">
             <thead class="thead-light">
               <tr>
-                <th scope="col" class="forum-col">Forum</th>
-                <th scope="col">Topics</th>
-                <th scope="col">Posts</th>
-                <th scope="col" class="last-post-col">Last post</th>
+                <th scope="col" class="forum-col">Message</th>
+                <th scope="col">Date</th>
+                <th scope="col" class="last-post-col">Author</th>
               </tr>
             </thead>
             <tbody>
-              <tr class="thread">
+              <% newestMessages.forEach(message => { %>
+              <tr>
                 <td>
-                  <h3 class="h5 mb-0"><a href="#0" class="text-uppercase">Forum name</a></h3>
-                  <p class="mb-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. In laoreet pellentesque lorem sed elementum.</p>
+                  <p class="mb-0">
+                    <a href="<%= message.getLink() %>"> <%= message.content.slice(0, 100) %></a>
+                  </p>
                 </td>
                 <td>
-                  <div>5</div>
+                  <div><%= new Date(message.time).toLocaleString() %></div>
                 </td>
                 <td>
-                  <div>18</div>
-                </td>
-                <td>
-                  <h4 class="h6 mb-0 font-weight-bold"><a href="#0">Post name</a></h4>
-                  <div>by <a href="#0">Author name</a></div>
-                  <div>05 Apr 2017, 20:07</div>
+                  <div class="avatar">by <a href="<%= message.getLink() %>"><%= message.author.name %></a><img src="<%=message.author.avatar %>"></div>
                 </td>
               </tr>
+              <% }) %>
             </tbody>
           </table>
         </div>
@@ -62,22 +59,17 @@
                 <div class="card-body">
                   <h2 class="h4 card-title">Members online</h2>
                   <ul class="list-unstyled mb-0">
-                    <li><a href="/users">You</a></li>
-
+                    <li>
+                      <% onlineUsers.forEach(user => { %>
+                      <a href="/users/<%=user.id  %>"><%= user.name %></a>
+                      <% }); %>
+                    </li>
                   </ul>
                 </div>
                 <div class="card-footer">
                   <dl class="row mb-0">
                     <dt class="col-8">Total:</dt>
-                    <dd class="col-4 mb-0">-</dd>
-                  </dl>
-                  <dl class="row mb-0">
-                    <dt class="col-8">Members:</dt>
-                    <dd class="col-4 mb-0">-</dd>
-                  </dl>
-                  <dl class="row mb-0">
-                    <dt class="col-8">Guests:</dt>
-                    <dd class="col-4 mb-0">-</dd>
+                    <dd class="col-4 mb-0"><%= onlineUserCount %></dd>
                   </dl>
                 </div>
               </div>
@@ -85,11 +77,9 @@
             <div class="col-12 col-sm-6 col-xl-12">
               <div class="card">
                 <div class="card-body">
-
                   <h2 class="h4 card-title">Forum statistics</h2>
-                  
                   <dl class="row mb-0">
-                    <dt class="col-8">Total forums:</dt>
+                    <dt class="col-8">Total categories:</dt>
                     <dd class="col-4 mb-0"><%= categories %></dd>
                   </dl>
                   <dl class="row mb-0">
@@ -107,7 +97,7 @@
                 </div>
                 <div class="card-footer">
                   <div>Newest member:</div>
-                  <div><a href="#0"><%= newestMember %></a></div>
+                  <div><a href="/users/<% newestMember.id %>"><%= newestMember.name %></a></div>
                 </div>
               </div>
             </div>
diff --git a/src/themes/bootstrap_black/views/threads.ejs b/src/themes/bootstrap_black/views/threads.ejs
index b2b0f5e..b391cab 100644
--- a/src/themes/bootstrap_black/views/threads.ejs
+++ b/src/themes/bootstrap_black/views/threads.ejs
@@ -34,7 +34,6 @@
                   </h3>
                 </td>
                 <td>
-                  <div> </div>
                   <div class="avatar">by <a href="<%= thread.getLink() %>"><%= thread.author.name %></a><img src="<%=thread.author.avatar %>"></div>
                   <div><%= new Date(thread.time).toLocaleString() %></div>
                 </td>