From 8e1eff30f5e961048ccb4b33ab4e959536796bed Mon Sep 17 00:00:00 2001
From: Akif9748 <akif9748@gmail.com>
Date: Thu, 25 May 2023 18:00:53 +0300
Subject: [PATCH] usermenu not needs to templates

---
 .../bootstrap_black/views/extra/usermenu.ejs  |  82 ---------
 src/themes/bootstrap_black/views/user.ejs     | 164 ++++++++++++++++++
 src/themes/common/views/extra/usermenu.ejs    |  72 --------
 src/themes/common/views/user.ejs              |  77 +++++++-
 4 files changed, 239 insertions(+), 156 deletions(-)
 delete mode 100644 src/themes/bootstrap_black/views/extra/usermenu.ejs
 create mode 100644 src/themes/bootstrap_black/views/user.ejs
 delete mode 100644 src/themes/common/views/extra/usermenu.ejs

diff --git a/src/themes/bootstrap_black/views/extra/usermenu.ejs b/src/themes/bootstrap_black/views/extra/usermenu.ejs
deleted file mode 100644
index 9cc5ea2..0000000
--- a/src/themes/bootstrap_black/views/extra/usermenu.ejs
+++ /dev/null
@@ -1,82 +0,0 @@
-<% if(user?.admin || user?.id === member.id){ %>
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
-  <div class="container-fluid">
-    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#userMenu" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
-    <div class="collapse navbar-collapse" id="userMenu">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-        <% if (!member.discordID && discord && user?.id === member.id) { %>
-        <a href="<%=discord%>" class="btn-outline-primary">Discord auth</a>
-        <% } else if(member.discordID && user?.id === member.id) { %>
-        <a class="btn-primary" id="un_discord">Unauth Discord</a>
-        <% } %>
-        <% if (member.hideLastSeen) {%>
-        <a id="last_unhide" class="btn-primary">Unhide last seen</a>
-        <% } else { %>
-        <a id="last_hide" class="btn-outline-primary">Hide last seen</a>
-        <% } %>
-        <% if (member.deleted) {%>
-        <h1>This user has been deleted!</h1>
-        <a id="undelete" class="btn-primary">Undelete user</a>
-        <% } else if (user?.admin){ %>
-        <a id="delete" class="btn-outline-primary">Delete user</a>
-        <% } %>
-        <a class="btn-outline-primary" href="/users/<%=member.id%>/edit">Edit user</a>
-        <a href="/users/<%=member.id%>/avatar" class="btn-outline-primary">Upload avatar</a>
-      </ul>
-
-      <script type="module">
-        import request from "../../js/request.js";
-
-
-        document.addEventListener("click", async e => {
-          if (e.target.id == "delete") {
-            const response = await request("/api/users/<%= member.id %>", "DELETE");
-            if (response.state !== "DELETED") return
-            alert("User is deleted!");
-            location.reload()
-          } else if (e.target.id == "undelete") {
-            const response = await request("/api/users/<%= member.id %>/", "PATCH", {
-              deleted: false
-            });
-            if (response.state == "DELETED") return;
-            alert("User is undeleted successfully!");
-            location.reload()
-          } else if (e.target.id == "un_discord") {
-            const response = await fetch("/auth/discord/", {
-              method: "DELETE"
-            });
-            alert(await response.text());
-            location.reload()
-          } else if (e.target.id.startsWith("last_")) {
-            let hideLastSeen = e.target.id.replace("last_", "") == "hide" ? true : false;
-            const response = await request("/api/users/<%= member.id %>/", "PATCH", {
-              hideLastSeen
-            });
-            alert(`Last seen is ${!hideLastSeen?"un":""}hided!`);
-            location.reload()
-
-          } else if (e.target.id == "toogle")
-            document.getElementById('user-edit').classList.toggle('no-active')
-
-        });
-      </script>
-
-
-
-    </div>
-  </div>
-
-
-</nav>
-<% if (user.admin) { %>
-<select>
-  <option selected>IP LIST</option>
-  <% for(const ip of member.ips) { %>
-  <option><%= ip %></option>
-  <% } %>
-</select>
-<% } %>
-
-<% } %>
\ No newline at end of file
diff --git a/src/themes/bootstrap_black/views/user.ejs b/src/themes/bootstrap_black/views/user.ejs
new file mode 100644
index 0000000..95d7e85
--- /dev/null
+++ b/src/themes/bootstrap_black/views/user.ejs
@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<%- include(dataset.getFile(dataset.theme.codename +"/views/extra/meta"), {title: member.name }) %>
+
+
+<body>
+  <%- include(dataset.getFile(dataset.theme.codename +"/views/extra/navbar")) %>
+
+
+
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css" integrity="sha512-xh6O/CkQoPOWDdYTDqeRdPCVd1SpvCA9XXcUnZS2FmJNp1coAFzvtCN9BmamE+4aHK8yyUHUSCcJHgXloTyT2A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/2.1.0/showdown.min.js"></script>
+
+  <div class="usercontent">
+
+
+    <% if(user?.admin || user?.id === member.id){ %>
+        <nav class="navbar navbar-expand-lg navbar-light bg-light">
+          <div class="container-fluid">
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#userMenu" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
+              <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="userMenu">
+              <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                <% if (!member.discordID && discord && user?.id === member.id) { %>
+                <a href="<%=discord%>" class="btn-outline-primary">Discord auth</a>
+                <% } else if(member.discordID && user?.id === member.id) { %>
+                <a class="btn-primary" id="un_discord">Unauth Discord</a>
+                <% } %>
+                <% if (member.hideLastSeen) {%>
+                <a id="last_unhide" class="btn-primary">Unhide last seen</a>
+                <% } else { %>
+                <a id="last_hide" class="btn-outline-primary">Hide last seen</a>
+                <% } %>
+                <% if (member.deleted) {%>
+                <h1>This user has been deleted!</h1>
+                <a id="undelete" class="btn-primary">Undelete user</a>
+                <% } else if (user?.admin){ %>
+                <a id="delete" class="btn-outline-primary">Delete user</a>
+                <% } %>
+                <a class="btn-outline-primary" href="/users/<%=member.id%>/edit">Edit user</a>
+                <a href="/users/<%=member.id%>/avatar" class="btn-outline-primary">Upload avatar</a>
+              </ul>
+        
+              <script type="module">
+                import request from "../../js/request.js";
+        
+        
+                document.addEventListener("click", async e => {
+                  if (e.target.id == "delete") {
+                    const response = await request("/api/users/<%= member.id %>", "DELETE");
+                    if (response.state !== "DELETED") return
+                    alert("User is deleted!");
+                    location.reload()
+                  } else if (e.target.id == "undelete") {
+                    const response = await request("/api/users/<%= member.id %>/", "PATCH", {
+                      deleted: false
+                    });
+                    if (response.state == "DELETED") return;
+                    alert("User is undeleted successfully!");
+                    location.reload()
+                  } else if (e.target.id == "un_discord") {
+                    const response = await fetch("/auth/discord/", {
+                      method: "DELETE"
+                    });
+                    alert(await response.text());
+                    location.reload()
+                  } else if (e.target.id.startsWith("last_")) {
+                    let hideLastSeen = e.target.id.replace("last_", "") == "hide" ? true : false;
+                    const response = await request("/api/users/<%= member.id %>/", "PATCH", {
+                      hideLastSeen
+                    });
+                    alert(`Last seen is ${!hideLastSeen?"un":""}hided!`);
+                    location.reload()
+        
+                  } else if (e.target.id == "toogle")
+                    document.getElementById('user-edit').classList.toggle('no-active')
+        
+                });
+              </script>
+        
+        
+        
+            </div>
+          </div>
+        
+        
+        </nav>
+        <% if (user.admin) { %>
+        <select>
+          <option selected>IP LIST</option>
+          <% for(const ip of member.ips) { %>
+          <option><%= ip %></option>
+          <% } %>
+        </select>
+        <% } %>
+        
+        <% } %>
+
+
+    <div class="userbox" style="justify-content:center;">
+      <img style="width:150px;height:150px;border-radius:50%;" src="<%=member.avatar %>">
+    </div>
+
+    <% if (member.admin) { %>
+    <h2 class="userbox-value" style="align-self: center;">Admin</h2>
+    <% } %>
+
+    <% if (member.about?.length) { %>
+    <div class="userbox-value" id="about" style="
+margin: 10px auto;
+box-shadow: 0 0 5px 0 var(--second);
+padding: 10px;
+width: 100%;
+max-width: 800px;
+text-align: center;
+border-radius: 5px;
+background: none;
+color: var(--anti);
+">
+      <%= member.about %>
+    </div>
+    <script>
+      const converter = new showdown.Converter();
+      const about = document.getElementById("about")
+      about.innerHTML = converter.makeHtml(about.innerText);
+    </script>
+    <% } %>
+
+
+
+    <div class="userbox">
+      <h2 class="userbox-title">Name:</h2>
+      <h2 class="userbox-value"><%= member.name %></h2>
+    </div>
+    <div class="userbox">
+      <h2 class="userbox-title">Created at:</h2>
+      <h2 class="userbox-value"><%= new Date(member.time).toLocaleString() %></h2>
+    </div>
+    <% if(!member.hideLastSeen || user?.admin) {%>
+    <div class="userbox">
+      <h2 class="userbox-title">Last seen at:</h2>
+      <h2 class="userbox-value"><%= new Date(member.lastSeen).toLocaleString() %></h2>
+    </div>
+    <% } %>
+    <div class="userbox">
+      <h2 class="userbox-title">Message:</h2>
+      <a class="userbox-value" href="/search/messages?authorID=<%= member.id %>">
+        <%= counts.message %>
+      </a>
+    </div>
+    <div class="userbox">
+      <h2 class="userbox-title">Thread:</h2>
+      <a class="userbox-value" href="/search/threads?authorID=<%= member.id %>">
+        <%= counts.thread %>
+      </a>
+    </div>
+  </div>
+  <%- include(dataset.getFile(dataset.theme.codename +"/views/extra/footer")) %>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/themes/common/views/extra/usermenu.ejs b/src/themes/common/views/extra/usermenu.ejs
deleted file mode 100644
index 8b9a7dd..0000000
--- a/src/themes/common/views/extra/usermenu.ejs
+++ /dev/null
@@ -1,72 +0,0 @@
-<% if(user?.admin || user?.id === member.id){ %>
-    <details>
-      <summary class="btn-outline-primary">User Menu:</summary>
-    
-      <% if (!member.discordID && discord && user?.id === member.id) { %>
-      <a href="<%=discord%>" class="btn-outline-primary">DC auth</a>
-      <% } else if(member.discordID && user?.id === member.id) { %>
-      <a class="btn-outline-primary" id="un_discord">Unauth DC!</a>
-      <% } %>
-      <a href="/users/<%=member.id%>/avatar" class="btn-outline-primary">Upload avatar</a>
-      <a class="btn-outline-primary" id="toogle">Edit user!</a>
-      <script type="module">
-        import request from "/js/request.js";
-    
-        const form = document.getElementById("form");
-    
-        document.addEventListener("click", async e => {
-          if (e.target.id == "delete") {
-            const response = await request("/api/users/<%= member.id %>", "DELETE");
-            if (response.state !== "DELETED") return
-            alert("User is deleted!");
-            location.reload()
-          } else if (e.target.id == "undelete") {
-            const response = await request("/api/users/<%= member.id %>/", "PATCH", {
-              deleted: false
-            });
-            if (response.state == "DELETED") return;
-            alert("User is undeleted successfully!");
-            location.reload()
-          } else if (e.target.id == "un_discord") {
-            const response = await fetch("/auth/discord/", {
-              method: "DELETE"
-            });
-            alert(await response.text());
-            location.reload()
-          } else if (e.target.id.startsWith("last_")) {
-            let hideLastSeen = e.target.id.replace("last_", "") == "hide" ? true : false;
-            const response = await request("/api/users/<%= member.id %>/", "PATCH", {
-              hideLastSeen
-            });
-            alert(`Last seen is ${!hideLastSeen?"un":""}hided!`);
-            location.reload()
-    
-          } else if (e.target.id == "toogle")
-            document.getElementById('user-edit').classList.toggle('no-active')
-    
-        });
-      </script>
-    
-      <% if (member.hideLastSeen) {%>
-      <a id="last_unhide" class="btn-primary">Unhide last seen! </a>
-      <% } else { %>
-      <a id="last_hide" class="btn-outline-primary">Hide last seen! </a>
-      <% } %>
-    
-      <% if (member.deleted) {%>
-      <h1>This user has been deleted!</h1>
-      <a id="undelete" class="btn-primary">Undelete user! </a>
-      <% } else if (user?.admin){ %>
-      <a id="delete" class="btn-outline-primary">Delete user! </a>
-      <% } %>
-      <% if (user?.admin) {%>
-      <h2>IP adresses of the user:</h2>
-      <select>
-        <% for(const ip of member.ips) { %>
-        <option><%= ip %></option>
-        <% } %>
-      </select>
-    
-      <% } %>
-    </details>
-    <% } %>
\ No newline at end of file
diff --git a/src/themes/common/views/user.ejs b/src/themes/common/views/user.ejs
index 1f24020..5dffdd0 100644
--- a/src/themes/common/views/user.ejs
+++ b/src/themes/common/views/user.ejs
@@ -14,8 +14,81 @@
 
   <div class="usercontent">
 
-    <%- include(dataset.getFile(dataset.theme.codename +"/views/extra/usermenu")) %>
-    <div class="userbox" style="justify-content:center;">
+    <% if(user?.admin || user?.id === member.id){ %>
+      <details>
+        <summary class="btn-outline-primary">User Menu:</summary>
+      
+        <% if (!member.discordID && discord && user?.id === member.id) { %>
+        <a href="<%=discord%>" class="btn-outline-primary">DC auth</a>
+        <% } else if(member.discordID && user?.id === member.id) { %>
+        <a class="btn-outline-primary" id="un_discord">Unauth DC!</a>
+        <% } %>
+        <a href="/users/<%=member.id%>/avatar" class="btn-outline-primary">Upload avatar</a>
+        <a class="btn-outline-primary" id="toogle">Edit user!</a>
+        <script type="module">
+          import request from "/js/request.js";
+      
+          const form = document.getElementById("form");
+      
+          document.addEventListener("click", async e => {
+            if (e.target.id == "delete") {
+              const response = await request("/api/users/<%= member.id %>", "DELETE");
+              if (response.state !== "DELETED") return
+              alert("User is deleted!");
+              location.reload()
+            } else if (e.target.id == "undelete") {
+              const response = await request("/api/users/<%= member.id %>/", "PATCH", {
+                deleted: false
+              });
+              if (response.state == "DELETED") return;
+              alert("User is undeleted successfully!");
+              location.reload()
+            } else if (e.target.id == "un_discord") {
+              const response = await fetch("/auth/discord/", {
+                method: "DELETE"
+              });
+              alert(await response.text());
+              location.reload()
+            } else if (e.target.id.startsWith("last_")) {
+              let hideLastSeen = e.target.id.replace("last_", "") == "hide" ? true : false;
+              const response = await request("/api/users/<%= member.id %>/", "PATCH", {
+                hideLastSeen
+              });
+              alert(`Last seen is ${!hideLastSeen?"un":""}hided!`);
+              location.reload()
+      
+            } else if (e.target.id == "toogle")
+              document.getElementById('user-edit').classList.toggle('no-active')
+      
+          });
+        </script>
+      
+        <% if (member.hideLastSeen) {%>
+        <a id="last_unhide" class="btn-primary">Unhide last seen! </a>
+        <% } else { %>
+        <a id="last_hide" class="btn-outline-primary">Hide last seen! </a>
+        <% } %>
+      
+        <% if (member.deleted) {%>
+        <h1>This user has been deleted!</h1>
+        <a id="undelete" class="btn-primary">Undelete user! </a>
+        <% } else if (user?.admin){ %>
+        <a id="delete" class="btn-outline-primary">Delete user! </a>
+        <% } %>
+        <% if (user?.admin) {%>
+        <h2>IP adresses of the user:</h2>
+        <select>
+          <% for(const ip of member.ips) { %>
+          <option><%= ip %></option>
+          <% } %>
+        </select>
+      
+        <% } %>
+      </details>
+      <% } %>
+      
+      
+      <div class="userbox" style="justify-content:center;">
       <img style="width:150px;height:150px;border-radius:50%;" src="<%=member.avatar %>">
     </div>