diff --git a/Sean/inusers.js b/Sean/inusers.js new file mode 100644 index 0000000..a2f8062 --- /dev/null +++ b/Sean/inusers.js @@ -0,0 +1,30 @@ +// inusers.js + +const express = require('express'); +const router = express.Router(); + +// Middleware to check if the user is authenticated +function isAuthenticated(req, res, next) { + if (req.session && req.session.authenticated) { + return next(); + } else { + res.redirect('/login'); + } +} + +// InUsers route (renders the InUsers tab) +router.get('/', isAuthenticated, (req, res) => { + res.render('inusers'); +}); + +// User Data route +router.get('/userdata', isAuthenticated, (req, res) => { + res.render('user-data'); +}); + +// Edit User Data route +router.get('/edituserdata', isAuthenticated, (req, res) => { + res.render('edit-user-data'); +}); + +module.exports = router; diff --git a/Sean/server.js b/Sean/server.js index 3708fdc..f7ea95d 100644 --- a/Sean/server.js +++ b/Sean/server.js @@ -5,7 +5,7 @@ const bodyParser = require('body-parser'); const app = express(); const PORT = process.env.PORT || 3000; -require('dotenv').config() +require('dotenv').config(); // MySQL setup (replace with your MySQL connection details) const mysqlConfig = { @@ -13,6 +13,7 @@ const mysqlConfig = { user: process.env.user, password: process.env.password, database: process.env.database, + timezone: 'Z', // Set the timezone to UTC }; const mysqlConnection = mysql.createConnection(mysqlConfig); @@ -25,7 +26,6 @@ app.get('/login', (req, res) => { res.render('login'); }); -// Check if the user is authenticated before accessing certain routes function isAuthenticated(req, res, next) { if (req.session && req.session.authenticated) { return next(); @@ -34,41 +34,91 @@ function isAuthenticated(req, res, next) { } } -// Login route app.post('/login', (req, res) => { let { username, password } = req.body; - - // Trim leading and trailing spaces from username username = username.trim(); - // Validate username and password against MySQL - const sql = 'SELECT * FROM users WHERE username = ? AND password = ?'; - mysqlConnection.query(sql, [username, password], (error, results) => { + const loginSql = 'SELECT * FROM users WHERE username = ? AND password = ?'; + const updateLastLoginSql = 'UPDATE users SET lastLogin = CURRENT_TIMESTAMP WHERE username = ?'; + + // Check credentials and retrieve user information + const connection = mysql.createConnection(mysqlConfig); + + connection.connect(); + + connection.query(loginSql, [username, password], (error, results) => { if (error) { console.error('Error executing login query:', error); res.status(500).send('Internal Server Error'); + connection.end(); // Close the connection in case of an error return; } - console.log('SQL Query:', sql, [username, password]); - console.log('Query Results:', results); - if (results.length === 0) { res.status(401).send('Invalid username or password'); + connection.end(); // Close the connection when not needed anymore } else { - // Set session data for authentication - req.session.authenticated = true; - req.session.username = username; + // Update lastLogin field for the user + connection.query(updateLastLoginSql, [username], (updateError, updateResults) => { + if (updateError) { + console.error('Error updating lastLogin:', updateError); + res.status(500).send('Internal Server Error'); + connection.end(); // Close the connection in case of an error + return; + } - // Redirect to the home page or any other protected route - res.redirect('/home'); + // Check if the update affected any rows + if (updateResults.affectedRows > 0) { + // Set session data for authentication + req.session.authenticated = true; + req.session.username = username; + + // Redirect to the home page or any other protected route + res.redirect('/home'); + } else { + res.status(500).send('Error updating lastLogin. No rows affected.'); + } + + connection.end(); // Close the connection when not needed anymore + }); } }); }); -// Home route (protected by authentication) +// Update your /home route to retrieve the overall last 10 logins for all users app.get('/home', isAuthenticated, (req, res) => { - res.render('home', { username: req.session.username }); + // Retrieve the overall last 10 logins for all users + const loginsQuery = 'SELECT username, lastLogin FROM users ORDER BY lastLogin DESC LIMIT 10'; + + mysqlConnection.query(loginsQuery, (error, loginResults) => { + if (error) { + console.error('Error executing login logs query:', error); + res.status(500).send('Internal Server Error'); + return; + } + + // Log the results on the server side + console.log('Login Logs on Server:', loginResults); + + // Render the home page with login logs data + res.render('home', { username: req.session.username, loginLogs: loginResults }); + }); +}); + +app.get('/inusers', isAuthenticated, (req, res) => { + // Fetch all user data from the database + const allUsersQuery = 'SELECT * FROM users'; + + mysqlConnection.query(allUsersQuery, (error, allUsers) => { + if (error) { + console.error('Error fetching all users:', error); + res.status(500).send('Internal Server Error'); + return; + } + + // Render the inusers page with all user data + res.render('inusers', { allUsers: allUsers }); + }); }); app.use(express.static('views')); @@ -76,5 +126,3 @@ app.use(express.static('views')); app.listen(PORT, () => { console.log(`Server is running on port ${PORT}`); }); - - diff --git a/Sean/views/allusers.ejs b/Sean/views/allusers.ejs new file mode 100644 index 0000000..10b46ae --- /dev/null +++ b/Sean/views/allusers.ejs @@ -0,0 +1,30 @@ + + + + + + + + All Users + + + +

All Users

+ + + + + + + + + <% for (let i = 0; i < users.length; i++) { %> + + + + + <% } %> + +
Username
<%= users[i].username %>
+ + diff --git a/Sean/views/home.ejs b/Sean/views/home.ejs index ce02120..c54445f 100644 --- a/Sean/views/home.ejs +++ b/Sean/views/home.ejs @@ -1,270 +1,162 @@ - - + - - - - - GeeksForGeeks - - - , - + + - - + + + + Home + + + -
-
-

150

-

Likes

-
+ - likes -
+ -
-
-

320

-

Comments

-
+
+

Welcome to the Home Page, <%= username %>!

+

Last 10 Logins:

+ + + + + + + + + <% loginLogs.forEach(log => { %> + + + + + <% }); %> + +
UsernameLast Login Time
<%= log.username %><%= new Date(log.lastLogin).toLocaleString('en-US', { timeZone: 'Asia/Singapore' }) %>
- comments -
+ +
-
-
-

70

-

Published

-
+ - published -
- - -
-
-

Recent Articles

- -
- -
-
-

Article

-

Views

-

Comments

-

Status

-
- -
-
-

Article 73

-

2.9k

-

210

-

Published

-
- -
-

Article 72

-

1.5k

-

360

-

Published

-
- -
-

Article 71

-

1.1k

-

150

-

Published

-
- -
-

Article 70

-

1.2k

-

420

-

Published

-
- -
-

Article 69

-

2.6k

-

190

-

Published

-
- -
-

Article 68

-

1.9k

-

390

-

Published

-
- -
-

Article 67

-

1.2k

-

580

-

Published

-
- -
-

Article 66

-

3.6k

-

160

-

Published

-
- -
-

Article 65

-

1.3k

-

220

-

Published

-
- -
-
-
- - - - - diff --git a/Sean/views/index.js b/Sean/views/index.js index bab9fa2..5ee6953 100644 --- a/Sean/views/index.js +++ b/Sean/views/index.js @@ -1,28 +1,64 @@ -let menuicn = document.querySelector(".menuicn"); -let nav = document.querySelector(".navcontainer"); +const express = require('express'); +const router = express.Router(); +const mysql = require('mysql'); -menuicn.addEventListener("click", () => { - nav.classList.toggle("navclose"); -}) -document.addEventListener('DOMContentLoaded', () => { - // Fetch recent user logins from your server - fetch('/api/recentUserLogins') - .then(response => response.json()) - .then(userLogins => { - // Populate the recent user logins section - const itemsContainer = document.querySelector('.items'); - - userLogins.forEach(userLogin => { - const item = document.createElement('div'); - item.classList.add('item1'); - item.innerHTML = ` -

${userLogin.username}

-

${userLogin.name}

-

${userLogin.email}

-

${userLogin.lastLogin}

- `; - itemsContainer.appendChild(item); - }); - }) - .catch(error => console.error('Error fetching recent user logins:', error)); - }); \ No newline at end of file +// Replace with your MySQL connection details +const mysqlConfig = { + host: process.env.host, + user: process.env.user, + password: process.env.password, + database: process.env.database, + timezone: 'Z', // Set the timezone to UTC +}; + +const mysqlConnection = mysql.createConnection(mysqlConfig); + +// Middleware to check if the user is authenticated +function isAuthenticated(req, res, next) { + if (req.session && req.session.authenticated) { + return next(); + } else { + res.redirect('/login'); + } +} + +// InUsers route (renders the InUsers tab) +router.get('/', isAuthenticated, (req, res) => { + // Fetch all user data from the database + const userDataQuery = 'SELECT * FROM users'; + + mysqlConnection.query(userDataQuery, (error, userData) => { + if (error) { + console.error('Error fetching user data:', error); + res.status(500).send('Internal Server Error'); + return; + } + + // Render the inusers page with user data + res.render('inusers', { userData: userData }); + }); +}); + +// User Data route +router.get('/userdata', isAuthenticated, (req, res) => { + // Fetch all user data from the database + const userDataQuery = 'SELECT * FROM users'; + + mysqlConnection.query(userDataQuery, (error, userData) => { + if (error) { + console.error('Error fetching user data:', error); + res.status(500).send('Internal Server Error'); + return; + } + + // Render the user-data page with user data + res.render('user-data', { userData: userData }); + }); +}); + +// Edit User Data route +router.get('/edituserdata', isAuthenticated, (req, res) => { + res.render('edit-user-data'); +}); + +module.exports = router; diff --git a/Sean/views/inusers.ejs b/Sean/views/inusers.ejs new file mode 100644 index 0000000..f7a4ffd --- /dev/null +++ b/Sean/views/inusers.ejs @@ -0,0 +1,208 @@ + + + + + + + + + In-House Users + + + + + + + + +
+

Welcome to the In-House Users Page

+ +
+

All Users

+ + + + + + + + + + + + + + <% if (allUsers && allUsers.length > 0) { %> + <% allUsers.forEach(user => { %> + + + + + + + + + + <% }); %> + <% } else { %> + + + + <% } %> + +
NameUsernameEmailPasswordLast LoginJob Title
<%= user.name %><%= user.username %><%= user.email %><%= user.password %><%= new Date(user.lastLogin).toLocaleString('en-US', { timeZone: 'Asia/Singapore' }) %><%= user.jobTitle %>
No users available.
+
+ + + + + + +
+ + + + diff --git a/package-lock.json b/package-lock.json index 03d3f99..d202d60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,16 +61,39 @@ "negotiator": "0.6.3" } }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, + "async": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==" + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, + "bignumber.js": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.0.tgz", + "integrity": "sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A==" + }, "bl": { "version": "6.0.9", "resolved": "https://registry.npmjs.org/bl/-/bl-6.0.9.tgz", @@ -82,12 +105,12 @@ } }, "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "requires": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -95,7 +118,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.1", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -115,6 +138,14 @@ } } }, + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "requires": { + "balanced-match": "^1.0.0" + } + }, "buffer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", @@ -144,6 +175,15 @@ "resolved": "https://registry.npmjs.org/capitalize/-/capitalize-2.0.4.tgz", "integrity": "sha512-wcSyiFqXRYyCoqu0o0ekXzJAKCLMkqWS5QWGlgTJFJKwRmI6pzcN2hBl5VPq9RzLW5Uf4FF/V/lcFfjCtVak2w==" }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, "coap": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/coap/-/coap-1.3.0.tgz", @@ -165,6 +205,24 @@ "resolved": "https://registry.npmjs.org/coap-packet/-/coap-packet-1.1.1.tgz", "integrity": "sha512-Bkz2ZKI/7hU2gm6nUuo5l+MBSkdFJx7My1ZgNEhKUC7K2yYfQYVbBPRa64BBYLcEcYgaSlau4A1Uw5xfM2I0zw==" }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, "content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -195,6 +253,11 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, + "core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -243,6 +306,14 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, + "ejs": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", + "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "requires": { + "jake": "^10.8.5" + } + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -306,6 +377,76 @@ "vary": "~1.1.2" }, "dependencies": { + "body-parser": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } + } + }, + "express-session": { + "version": "1.17.3", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz", + "integrity": "sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==", + "requires": { + "cookie": "0.4.2", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~2.0.0", + "on-headers": "~1.0.2", + "parseurl": "~1.3.3", + "safe-buffer": "5.2.1", + "uid-safe": "~2.1.5" + }, + "dependencies": { + "cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -331,6 +472,24 @@ "resolved": "https://registry.npmjs.org/fastseries/-/fastseries-2.0.0.tgz", "integrity": "sha512-XBU9RXeoYc2/VnvMhplAxEmZLfIk7cvTBu+xwoBuTI8pL19E03cmca17QQycKIdxgwCeFA/a4u27gv1h3ya5LQ==" }, + "filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "requires": { + "minimatch": "^5.0.1" + }, + "dependencies": { + "minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "requires": { + "brace-expansion": "^2.0.1" + } + } + } + }, "finalhandler": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", @@ -402,6 +561,11 @@ "get-intrinsic": "^1.1.3" } }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, "has-property-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", @@ -473,6 +637,22 @@ "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==" }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, + "jake": { + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", + "requires": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + } + }, "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", @@ -524,6 +704,25 @@ "mime-db": "1.52.0" } }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "requires": { + "brace-expansion": "^1.1.7" + }, + "dependencies": { + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + } + } + }, "moment": { "version": "2.29.4", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", @@ -542,6 +741,46 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "mysql": { + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/mysql/-/mysql-2.18.1.tgz", + "integrity": "sha512-Bca+gk2YWmqp2Uf6k5NFEurwY/0td0cpebAucFpY/3jhrwrVGuxU2uQFCHjU19SJfje0yQvi+rVWdq78hR5lig==", + "requires": { + "bignumber.js": "9.0.0", + "readable-stream": "2.3.7", + "safe-buffer": "5.1.2", + "sqlstring": "2.3.1" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "sqlstring": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.1.tgz", + "integrity": "sha512-ooAzh/7dxIG5+uDik1z/Rd1vli0+38izZhGzSa34FwR7IbelPWCCKSNIl8jlL/F7ERvy8CB2jNeM1E9i9mXMAQ==" + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "mysql2": { "version": "3.6.5", "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.6.5.tgz", @@ -605,6 +844,11 @@ "ee-first": "1.1.1" } }, + "on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -625,6 +869,11 @@ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==" }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, "proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -642,15 +891,20 @@ "side-channel": "^1.0.4" } }, + "random-bytes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", + "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==" + }, "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "requires": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -830,6 +1084,14 @@ } } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + }, "toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -849,6 +1111,14 @@ "mime-types": "~2.1.24" } }, + "uid-safe": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", + "requires": { + "random-bytes": "~1.0.0" + } + }, "undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", @@ -859,6 +1129,11 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", diff --git a/package.json b/package.json index aab5f90..99e7892 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,13 @@ }, "homepage": "https://github.com/Newtbot/MP#readme", "dependencies": { + "body-parser": "^1.20.2", "coap": "^1.3.0", "dotenv": "^16.3.1", + "ejs": "^3.1.9", "express": "^4.18.2", + "express-session": "^1.17.3", + "mysql": "^2.18.1", "mysql2": "^3.6.5", "sequelize": "^6.35.2" }