generated from lucien/api-template
add: added a user page and button to delete them
This commit is contained in:
parent
6c19015a29
commit
4045681913
8 changed files with 235 additions and 1 deletions
|
@ -50,6 +50,12 @@ router.post('/register', async (req, res) => {
|
||||||
const hash = sha256(password);
|
const hash = sha256(password);
|
||||||
await addUser(connection, username, hash);
|
await addUser(connection, username, hash);
|
||||||
connection.end();
|
connection.end();
|
||||||
|
|
||||||
|
req.sockets.emit({
|
||||||
|
type: 'new_user',
|
||||||
|
username: username,
|
||||||
|
});
|
||||||
|
|
||||||
res.send({ message: 'User added' });
|
res.send({ message: 'User added' });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,16 @@
|
||||||
const express = require('express');
|
const express = require('express');
|
||||||
const { getConnection, getUserByUsername, getUserLastMessages, getMentions } = require('../libs/mysql');
|
const { getConnection, getUsers, getUserByUsername, getUserLastMessages, getMentions, deleteUser, deleteUserMessages, deleteUserMentions } = require('../libs/mysql');
|
||||||
|
const { checkAuth } = require("../libs/middlewares")
|
||||||
|
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
|
router.get('/', async (req, res) => {
|
||||||
|
const connection = await getConnection();
|
||||||
|
const users = await getUsers(connection);
|
||||||
|
connection.end();
|
||||||
|
res.send(users);
|
||||||
|
});
|
||||||
|
|
||||||
router.get('/:username', async (req, res) => {
|
router.get('/:username', async (req, res) => {
|
||||||
const username = req.params.username;
|
const username = req.params.username;
|
||||||
const connection = await getConnection();
|
const connection = await getConnection();
|
||||||
|
@ -33,4 +41,37 @@ router.get('/:username/lastmessages', async (req, res) => {
|
||||||
res.send(messages);
|
res.send(messages);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
router.use("/:username/delete", checkAuth);
|
||||||
|
router.post('/:username/delete', async (req, res) => {
|
||||||
|
const username = req.params.username;
|
||||||
|
const user = req.user;
|
||||||
|
|
||||||
|
const connection = await getConnection();
|
||||||
|
|
||||||
|
const userToDelete = await getUserByUsername(connection, username);
|
||||||
|
|
||||||
|
if (!userToDelete[0]) {
|
||||||
|
connection.end();
|
||||||
|
return res.status(400).send({ error: 'No user found' });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (user.admin !== 1) {
|
||||||
|
connection.end();
|
||||||
|
return res.status(401).send({ error: 'Unauthorized' });
|
||||||
|
}
|
||||||
|
|
||||||
|
await deleteUserMentions(connection, userToDelete[0].id);
|
||||||
|
await deleteUserMessages(connection, userToDelete[0].id);
|
||||||
|
await deleteUser(connection, userToDelete[0].id);
|
||||||
|
|
||||||
|
connection.end();
|
||||||
|
|
||||||
|
req.sockets.emit({
|
||||||
|
type: 'delete_user',
|
||||||
|
user_id: userToDelete[0].id,
|
||||||
|
});
|
||||||
|
|
||||||
|
res.send({ message: 'User deleted' });
|
||||||
|
});
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
|
@ -9,6 +9,20 @@ function getConnection() {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getUsers(connection) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
connection.query(
|
||||||
|
`SELECT id, username, admin FROM users`,
|
||||||
|
(error, result) => {
|
||||||
|
if (error) {
|
||||||
|
reject(new Error(error));
|
||||||
|
}
|
||||||
|
resolve(result);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function getUser(connection, id) {
|
function getUser(connection, id) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
connection.query(
|
connection.query(
|
||||||
|
@ -89,6 +103,21 @@ function getUserLastMessages(connection, username) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function deleteUser(connection, id) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
connection.query(
|
||||||
|
`DELETE FROM users WHERE id = ?`,
|
||||||
|
[id], // Use parameterized query
|
||||||
|
(error, result) => {
|
||||||
|
if (error) {
|
||||||
|
reject(new Error(error));
|
||||||
|
}
|
||||||
|
resolve(result);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
function getChannels(connection) {
|
function getChannels(connection) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
connection.query(
|
connection.query(
|
||||||
|
@ -310,6 +339,21 @@ function deleteChannelMessages(connection, channel_id) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function deleteUserMessages(connection, user_id) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
connection.query(
|
||||||
|
`DELETE FROM messages WHERE user_id = ?`,
|
||||||
|
[user_id], // Use parameterized query
|
||||||
|
(error, result) => {
|
||||||
|
if (error) {
|
||||||
|
reject(new Error(error));
|
||||||
|
}
|
||||||
|
resolve(result);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function addMention(connection, message_id, user_id) {
|
function addMention(connection, message_id, user_id) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
connection.query(
|
connection.query(
|
||||||
|
@ -373,12 +417,29 @@ function deleteChannelMentions(connection, channel_id) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function deleteUserMentions(connection, user_id) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
connection.query(
|
||||||
|
`DELETE FROM mentions WHERE user_id = ?`,
|
||||||
|
[user_id], // Use parameterized query
|
||||||
|
(error, result) => {
|
||||||
|
if (error) {
|
||||||
|
reject(new Error(error));
|
||||||
|
}
|
||||||
|
resolve(result);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
getUsers,
|
||||||
getConnection,
|
getConnection,
|
||||||
getUser,
|
getUser,
|
||||||
searchUser,
|
searchUser,
|
||||||
getUserByUsername,
|
getUserByUsername,
|
||||||
addUser,
|
addUser,
|
||||||
|
deleteUser,
|
||||||
getUserLastMessages,
|
getUserLastMessages,
|
||||||
getChannels,
|
getChannels,
|
||||||
getActiveChannels,
|
getActiveChannels,
|
||||||
|
@ -393,8 +454,10 @@ module.exports = {
|
||||||
addMessage,
|
addMessage,
|
||||||
deleteMessage,
|
deleteMessage,
|
||||||
deleteChannelMessages,
|
deleteChannelMessages,
|
||||||
|
deleteUserMessages,
|
||||||
addMention,
|
addMention,
|
||||||
getMentions,
|
getMentions,
|
||||||
deleMentions,
|
deleMentions,
|
||||||
|
deleteUserMentions,
|
||||||
deleteChannelMentions,
|
deleteChannelMentions,
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,6 +9,7 @@ export default function TopBar({ user }: { user: User | undefined }) {
|
||||||
<div className="topbar-left">
|
<div className="topbar-left">
|
||||||
<Link to="/">Home</Link>
|
<Link to="/">Home</Link>
|
||||||
<Link to="/channels">Channels</Link>
|
<Link to="/channels">Channels</Link>
|
||||||
|
<Link to="/users">Users</Link>
|
||||||
</div>
|
</div>
|
||||||
<div className="topbar-center">
|
<div className="topbar-center">
|
||||||
{user && user.id == 5 ? (
|
{user && user.id == 5 ? (
|
||||||
|
|
|
@ -9,6 +9,7 @@ import Login from './pages/Login'
|
||||||
import Register from './pages/Register'
|
import Register from './pages/Register'
|
||||||
import CreateChannel from './pages/CreateChannel'
|
import CreateChannel from './pages/CreateChannel'
|
||||||
import ChannelsPage from './pages/ChannelsPage'
|
import ChannelsPage from './pages/ChannelsPage'
|
||||||
|
import UsersPage from './pages/UsersPage'
|
||||||
|
|
||||||
const socket = new WebSocket("/api/ws");
|
const socket = new WebSocket("/api/ws");
|
||||||
|
|
||||||
|
@ -31,6 +32,7 @@ createRoot(document.getElementById('root')!).render(
|
||||||
<Route path="/register" element={<Register />} />
|
<Route path="/register" element={<Register />} />
|
||||||
<Route path="/create-channel" element={<CreateChannel />} />
|
<Route path="/create-channel" element={<CreateChannel />} />
|
||||||
<Route path="/channels" element={<ChannelsPage socket={socket} />} />
|
<Route path="/channels" element={<ChannelsPage socket={socket} />} />
|
||||||
|
<Route path="/users" element={<UsersPage socket={socket} />} />
|
||||||
</Routes>
|
</Routes>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
)
|
)
|
||||||
|
|
100
front/src/pages/UsersPage.tsx
Normal file
100
front/src/pages/UsersPage.tsx
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
import { useState, useEffect } from "react"
|
||||||
|
import { Link } from "react-router-dom"
|
||||||
|
import { User, Users } from "../types"
|
||||||
|
import axios from "axios"
|
||||||
|
import TopBar from "../components/TopBar"
|
||||||
|
|
||||||
|
import "../styles/UsersPage.css"
|
||||||
|
|
||||||
|
export default function UsersPage({socket}: {socket: WebSocket}) {
|
||||||
|
const [users, setUsers] = useState<Users>();
|
||||||
|
const [search, setSearch] = useState<string>("");
|
||||||
|
const [token, setToken] = useState<string>("");
|
||||||
|
const [thisUser, setThisUser] = useState<User>();
|
||||||
|
|
||||||
|
function deleteUser(username: string) {
|
||||||
|
axios
|
||||||
|
.post(`/api/users/${username}/delete`, { token })
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(err.response);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const token = localStorage.getItem("token")
|
||||||
|
|
||||||
|
if (token) {
|
||||||
|
setToken(token)
|
||||||
|
axios
|
||||||
|
.post("/api/auth/me", {
|
||||||
|
token: token
|
||||||
|
})
|
||||||
|
.then((res) => {
|
||||||
|
setThisUser(res.data)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
axios
|
||||||
|
.get("/api/users")
|
||||||
|
.then((res) => {
|
||||||
|
setUsers(res.data)
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(err.response)
|
||||||
|
})
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
socket.addEventListener('message', function (event) {
|
||||||
|
const data = JSON.parse(event.data);
|
||||||
|
if (data.type === "new_user" || data.type === "delete_user") {
|
||||||
|
axios
|
||||||
|
.get("/api/users")
|
||||||
|
.then((res) => {
|
||||||
|
setUsers(res.data)
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(err.response)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}, [])
|
||||||
|
|
||||||
|
if (!users) {
|
||||||
|
return (
|
||||||
|
<div className="users-page">
|
||||||
|
<TopBar user={thisUser} />
|
||||||
|
<div className="users-page-users">
|
||||||
|
<h2>Users</h2>
|
||||||
|
<p>Loading...</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="users-page">
|
||||||
|
<TopBar user={thisUser} />
|
||||||
|
<div className="users-page-channels">
|
||||||
|
<h2>Channels</h2>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="Search users"
|
||||||
|
value={search}
|
||||||
|
onChange={(e) => setSearch(e.target.value)}
|
||||||
|
/>
|
||||||
|
<ul>
|
||||||
|
{users?.sort().filter((channel) => channel.username.toLowerCase().includes(search.toLowerCase())).map((user) => (
|
||||||
|
<li key={user.id}>
|
||||||
|
<Link to={`/u/${user.username}`}>{user.username}</Link>
|
||||||
|
{thisUser?.admin == 1 && (
|
||||||
|
<button onClick={() => deleteUser(user.username)}>
|
||||||
|
Delete
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
19
front/src/styles/UsersPage.css
Normal file
19
front/src/styles/UsersPage.css
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
.users-page {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: start;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
gap: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.users-page-channels {
|
||||||
|
width: 97%;
|
||||||
|
border: 1px solid #270722;
|
||||||
|
padding: 10px;
|
||||||
|
background-color: #fff6fd;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: start;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
|
@ -43,3 +43,5 @@ export type User = {
|
||||||
username: string
|
username: string
|
||||||
admin: number
|
admin: number
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type Users = User[]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue