Finish user editable fields
This commit is contained in:
parent
b82895332a
commit
d9099943f0
27
index.js
27
index.js
|
@ -427,6 +427,21 @@ app.get('/user/logout', (req, res) => {
|
||||||
res.redirect('/user/login');
|
res.redirect('/user/login');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.get("/user/edit", (req, res) => {
|
||||||
|
if (!req.session.userAuthenticated) {
|
||||||
|
res.redirect('/user/login');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Remove block_start, block_length, and apiKey from the response
|
||||||
|
responseData = {
|
||||||
|
server: req.session.userData.server,
|
||||||
|
port: req.session.userData.port,
|
||||||
|
auth: req.session.userData.auth,
|
||||||
|
secret: req.session.userData.secret
|
||||||
|
}
|
||||||
|
res.render('user/edit', {data: responseData});
|
||||||
|
});
|
||||||
|
|
||||||
app.get('/api/v1/user/route', (req, res) => { // Get route
|
app.get('/api/v1/user/route', (req, res) => { // Get route
|
||||||
if (!req.session.userAuthenticated) {
|
if (!req.session.userAuthenticated) {
|
||||||
res.status(401).json({ error: 'Unauthorized' });
|
res.status(401).json({ error: 'Unauthorized' });
|
||||||
|
@ -450,18 +465,18 @@ app.put('/api/v1/user/route', (req, res) => { // Update route
|
||||||
const port = req.body.port || req.session.userData.port;
|
const port = req.body.port || req.session.userData.port;
|
||||||
const auth = req.body.auth || req.session.userData.auth;
|
const auth = req.body.auth || req.session.userData.auth;
|
||||||
const secret = req.body.secret || req.session.userData.secret;
|
const secret = req.body.secret || req.session.userData.secret;
|
||||||
// We don't allow block changes, admins only.
|
db.run('UPDATE routes SET server = ?, port = ?, auth = ?, secret = ? WHERE apiKey = ?',
|
||||||
const block_start = req.session.userData.block_start;
|
[server, port, auth, secret, req.session.userData.apiKey],
|
||||||
const block_length = req.session.userData.block_length;
|
|
||||||
const apiKey = req.session.userData.apiKey;
|
|
||||||
db.run('UPDATE routes SET server = ?, port = ?, auth = ?, secret = ?, block_start = ?, block_length = ? WHERE apiKey = ?',
|
|
||||||
[server, port, auth, secret, block_start, block_length, apiKey],
|
|
||||||
(err) => {
|
(err) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
console.error('Error updating route:', err);
|
console.error('Error updating route:', err);
|
||||||
res.status(500).json({ error: 'Internal server error' });
|
res.status(500).json({ error: 'Internal server error' });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
req.session.userData.server = server;
|
||||||
|
req.session.userData.port = port;
|
||||||
|
req.session.userData.auth = auth;
|
||||||
|
req.session.userData.secret = secret;
|
||||||
res.json({ message: 'Updated' });
|
res.json({ message: 'Updated' });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
25
public/assets/js/userEdit.js
Normal file
25
public/assets/js/userEdit.js
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
const editForm = document.getElementById('editForm');
|
||||||
|
editForm.addEventListener('submit', async (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
const formData = new FormData(editForm);
|
||||||
|
const data = {};
|
||||||
|
|
||||||
|
for (const [key, value] of formData.entries()) {
|
||||||
|
data[key] = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await fetch(`/api/v1/user/route`, {
|
||||||
|
method: 'PUT',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
body: JSON.stringify(data)
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.ok) {
|
||||||
|
window.location.href = '/user';
|
||||||
|
} else {
|
||||||
|
alert('Failed to update entry');
|
||||||
|
}
|
||||||
|
});
|
45
views/user/edit.ejs
Normal file
45
views/user/edit.ejs
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<link rel="stylesheet" href="/assets/css/bootstrap.min.css">
|
||||||
|
<title>AstroCom User - Edit</title>
|
||||||
|
</head>
|
||||||
|
<body class="bg-dark text-white">
|
||||||
|
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
|
||||||
|
<div class="container-fluid">
|
||||||
|
<a class="navbar-brand" href="#">AstroCom</a>
|
||||||
|
<div class="navbar-nav ms-auto">
|
||||||
|
<span class="navbar-text me-3">
|
||||||
|
Welcome
|
||||||
|
</span>
|
||||||
|
<a href="/user/logout" class="btn btn-danger">Logout</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
<div class="container mt-4">
|
||||||
|
<h2>Edit Server Information</h2>
|
||||||
|
<form id="editForm" onsubmit="return false;" class="mt-4">
|
||||||
|
<% for (const [key, value] of Object.entries(data)) { %>
|
||||||
|
<% if (key !== 'id') { %>
|
||||||
|
<div class="mb-3">
|
||||||
|
<label for="<%= key %>" class="form-label"><%= key.charAt(0).toUpperCase() + key.slice(1) %></label>
|
||||||
|
<input type="text" class="form-control bg-dark text-white" id="<%= key %>" name="<%= key %>" value="<%= value %>">
|
||||||
|
</div>
|
||||||
|
<% } %>
|
||||||
|
<% } %>
|
||||||
|
<button type="submit" class="btn btn-primary">Update</button>
|
||||||
|
<a href="/user" class="btn btn-secondary">Cancel</a>
|
||||||
|
</form>
|
||||||
|
<script>
|
||||||
|
const route = <%= data.id %>;
|
||||||
|
</script>
|
||||||
|
</div>
|
||||||
|
<script src="/assets/js/userEdit.js"></script>
|
||||||
|
</div>
|
||||||
|
<script src="/assets/js/bootstrap.min.js"></script>
|
||||||
|
<script src="/assets/js/bootstrap.bundle.min.js"></script>
|
||||||
|
<script src="/assets/js/jquery.min.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -27,7 +27,7 @@
|
||||||
<div class="card bg-secondary mb-4 text-white">
|
<div class="card bg-secondary mb-4 text-white">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="position-absolute top-0 end-0 m-3">
|
<div class="position-absolute top-0 end-0 m-3">
|
||||||
<a href="/user/edit" class="btn btn-primary disabled" id="editInfoBtn">Edit Information (Coming Soon)</a>
|
<a href="/user/edit" class="btn btn-primary" id="editInfoBtn">Edit Information</a>
|
||||||
</div>
|
</div>
|
||||||
<h5 class="card-title">Your Route Information</h5>
|
<h5 class="card-title">Your Route Information</h5>
|
||||||
<p class="card-text">
|
<p class="card-text">
|
||||||
|
|
Loading…
Reference in a new issue