From 258578e790638b20b0a215f14b72abed51c1bf1a Mon Sep 17 00:00:00 2001 From: Akif9748 Date: Fri, 26 Aug 2022 21:04:30 +0300 Subject: [PATCH] Undelete user Co-authored-by: Zeynep --- README.md | 2 +- routes/api/routes/users.js | 4 ++-- views/user.ejs | 33 +++++++++++++++++++++++++++------ views/users.ejs | 2 +- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index db3b266..7cbf0d9 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ And, you can learn about API in `util/APIDOCS.md`. | Admin | 🟢 | HIGH | | Message count | 🟢 | MEDIUM | | Delete user | 🟢 | HIGH | -| Undelete | 🔴 | MEDIUM | +| Undelete | 🟢 | MEDIUM | | About me | 🔴 | LOW | | Edit user | 🔴 | HIGH | | IP ban | 🔴 | MEDIUM | diff --git a/routes/api/routes/users.js b/routes/api/routes/users.js index 75d4925..7f2176d 100644 --- a/routes/api/routes/users.js +++ b/routes/api/routes/users.js @@ -32,10 +32,10 @@ app.post("/:id/delete/", async (req, res) => { app.post("/:id/undelete/", async (req, res) => { if (!req.user.admin) return res.error(403, "You have not got permission for this."); - const member = await UserModel.get(id); + const member = await UserModel.get(req.params.id); if (!member ) return res.error(404, `We don't have any user with id ${req.params.id}.`); - + if (!member.deleted) return res.error(404, "This user is not deleted, first, delete it."); member.deleted = false; diff --git a/views/user.ejs b/views/user.ejs index 7e9b046..369c458 100644 --- a/views/user.ejs +++ b/views/user.ejs @@ -1,7 +1,7 @@ -<%- include("extra/meta", {title: "User list!" }) %> +<%- include("extra/meta", {title: member.name }) %> @@ -66,17 +66,38 @@ const response = await request("/api/users/<%= member.id %>/delete"); - if (response.deleted) - alert("User Deleted"); + if (!response.deleted) return + alert("User is deleted!"); + location.reload() }); - <% }; %> - <% if (member.deleted) {%> + <% }; %> + <% if (member.deleted) {%>

This user has been deleted!

- <% }; %> + +
+ +
+ + + <% }; %> \ No newline at end of file diff --git a/views/users.ejs b/views/users.ejs index dd7de9a..0896dac 100644 --- a/views/users.ejs +++ b/views/users.ejs @@ -14,7 +14,7 @@
- <% if (user.deleted) { %> [DELETED]<% } %> + <% if (user.deleted) { %> [DELETED]<% } %> <%= user.name %>
<% }); %>