diff --git a/Sean/server.js b/Sean/server.js index 278a374..38f9b31 100644 --- a/Sean/server.js +++ b/Sean/server.js @@ -10,17 +10,13 @@ const otpGenerator = require('otp-generator'); const { body, validationResult } = require('express-validator'); const validator = require('validator'); const { format } = require('date-fns'); -const helmet = require('helmet'); + const { Sequelize } = require('sequelize'); const { transporter } = require("./modules/nodeMailer"); const { sequelize, User } = require("./modules/mysql"); const userLogs= require('./models/userLogs')(sequelize); // Adjust the path based on your project structure const app = express(); -const nonce = crypto.randomBytes(16).toString('base64'); - -console.log('Nonce:', nonce); - app.use(bodyParser.urlencoded({ extended: true })); app.use(bodyParser.json()); app.use(cookieParser()); @@ -30,17 +26,7 @@ require("dotenv").config(); app.use(bodyParser.urlencoded({ extended: true })); app.set("view engine", "ejs"); -app.use( - helmet.contentSecurityPolicy({ - directives: { - defaultSrc: ["'self'",`'nonce-${nonce}'`], - scriptSrc: ["'self'",`'nonce-${nonce}'`,"'strict-dynamic'", 'cdn.jsdelivr.net', 'fonts.googleapis.com', 'stackpath.bootstrapcdn.com', 'code.jquery.com', 'cdnjs.cloudflare.com'], - styleSrc: ["'self'",`'nonce-${nonce}'`, 'cdn.jsdelivr.net', 'fonts.googleapis.com'], - imgSrc: ["'self'"], - fontSrc: ["'self'", 'fonts.gstatic.com'], - }, - }) - ); + app.use(session({ secret: process.env.key, @@ -294,9 +280,8 @@ app.post("/verify-otp", [ }); const currentUsername = req.session.username; - // Render the inusers page with JSON data - res.render("inusers", { nonce: nonce, allUsers, csrfToken: csrfTokenSession, currentUsername }); + res.render("inusers", {allUsers, csrfToken: csrfTokenSession, currentUsername }); } catch (error) { console.error("Error fetching all users:", error); res.status(500).send("Internal Server Error"); @@ -814,6 +799,24 @@ app.get('/api/getLogs', async (req, res) => { } }); +app.get("/locations", isAuthenticated, async (req, res) => { + try { + // Render the inusers page with JSON data + res.render("locations"); + } catch (error) { + console.error("Error fetching all users:", error); + res.status(500).send("Internal Server Error"); + } +}); +app.get("/sensors", isAuthenticated, async (req, res) => { + try { + // Render the inusers page with JSON data + res.render("sensors"); + } catch (error) { + console.error("Error fetching all users:", error); + res.status(500).send("Internal Server Error"); + } +}); app.use(express.static("views")); app.listen(PORT, () => { diff --git a/Sean/views/home.ejs b/Sean/views/home.ejs index 31a082a..4d3222d 100644 --- a/Sean/views/home.ejs +++ b/Sean/views/home.ejs @@ -20,7 +20,8 @@ diff --git a/Sean/views/inusers.ejs b/Sean/views/inusers.ejs index 1975b70..2dea943 100644 --- a/Sean/views/inusers.ejs +++ b/Sean/views/inusers.ejs @@ -173,21 +173,19 @@ - - - - - - - - - + + + + + + + + diff --git a/Sean/views/location.js b/Sean/views/location.js new file mode 100644 index 0000000..79db94e --- /dev/null +++ b/Sean/views/location.js @@ -0,0 +1,92 @@ +$(document).ready(function () { + // Function to fetch and display locations + function fetchLocations() { + // Make a GET request to retrieve all locations + fetch('/api/v0/location', { + method: 'GET', + headers: { + 'Authorization': '2-eb0c08b0-250a-4249-8a87-11141e2ff8fb' + }, + }) + .then(response => { + if (response.ok) { + return response.json(); + } else { + throw new Error(`HTTP error! Status: ${response.status}`); + } + }) + .then(locations => { + // Clear existing table rows + $('#locationTableBody').empty(); + + // Populate the table with location information + locations.forEach(location => { + $('#locationTableBody').append(` + + ${location.id} + ${location.name} + ${location.description} + + `); + }); + }) + .catch(error => { + console.error('Error fetching locations:', error); + // Handle error as needed + }); + } + // Call the fetchLocations function when the page loads + fetchLocations(); +}); + +$(document).ready(function () { + $('#allLocationLink').on('click', function () { + $('#locationContainer').show(); + $('#createLocationForm').hide(); + }); + $('#addLocationLink').on('click', function () { + $('#locationContainer').hide(); + $('#createLocationForm').show(); + }); + }); + + +$('#locationForm').on('submit', function (e) { + e.preventDefault(); + + const location = $('#location').val(); + const user = req.session.jobTitle + const description = $('#description').val(); + + fetch('/api/v0/location/new', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'Authorization': '2-eb0c08b0-250a-4249-8a87-11141e2ff8fb' + }, + body: JSON.stringify({ + name: location, + added_by: user, + description: description + }), + }) + .then(response => { + if (response.ok) { + // Status 201 indicates successful creation + return response.json(); + } else { + return response.json().then(data => { + throw new Error(data.message || `HTTP error! Status: ${response.status}`); + }); + } +}) +.then(data => { + console.log(`Location added successfully. Message: ${data.message}`); + alert('Location added successfully!'); + resetFormFields(); +}) +.catch(error => { + console.error('Location not added successfully', error); + // Handle error as needed +}); + }); diff --git a/Sean/views/locations.ejs b/Sean/views/locations.ejs new file mode 100644 index 0000000..63eb54d --- /dev/null +++ b/Sean/views/locations.ejs @@ -0,0 +1,73 @@ + + + + + + + + + Home + + + + + + +
+

ECOSAVER MANAGEMENT

+
+ + + +
+ + + + + + + + + +
IDLocationDescriptions
+
+ + + + + +
+

Welcome to the Location

+
+ + + + + \ No newline at end of file diff --git a/Sean/views/sensor.js b/Sean/views/sensor.js new file mode 100644 index 0000000..25fdd32 --- /dev/null +++ b/Sean/views/sensor.js @@ -0,0 +1,160 @@ +$(document).ready(function () { + $('#allSensorLink').on('click', function () { + $('#sensorContainer').show(); + $('#createSensorForm').hide(); + }); + $('#addSensorLink').on('click', function () { + $('#sensorContainer').hide(); + $('#createSensorForm').show(); + }); + }); + let locationsArray = []; + + // Function to fetch and store locations in the array + function fetchLocations() { + // Make a GET request to retrieve all locations + fetch('/api/v0/location', { + method: 'GET', + }) + .then(response => { + if (response.ok) { + return response.json(); + } else { + throw new Error(`HTTP error! Status: ${response.status}`); + } + }) + .then(locations => { + // Reset the array + locationsArray = []; + + // Populate the array with location information + locations.forEach(location => { + // Store in the array + locationsArray.push({ + id: location.id, + location: location.name, + }); + }); + }) + .catch(error => { + console.error('Error fetching locations:', error); + // Handle error as needed + }); + } + // Call the fetchLocations function when the page loads + fetchLocations(); + + // Function to fetch sensor data and populate the table + function fetchAndPopulateSensorTable() { + // Fetch sensor data from the API + fetch('/api/v0/sensor', { + method: 'GET', + headers: { + 'Authorization': '1-1ec4ce9d-bcff-46c4-a023-c34171b9ca51' + }, + }) + .then(response => response.json()) + .then(sensorData => { + // Get the table body + const tableBody = document.getElementById('sensorTableBody'); + + // Clear existing rows + tableBody.innerHTML = ''; + + // Iterate through each sensor data + sensorData.forEach(sensor => { + // Find the corresponding location object + const location = locationsArray.find(loc => loc.id === sensor.location); + + // Create a new row + const row = tableBody.insertRow(); + + // Insert cells with sensor data + row.insertCell(0).textContent = sensor.id; + row.insertCell(1).textContent = sensor.sensorname; + row.insertCell(2).textContent = sensor.added_by; + row.insertCell(3).textContent = sensor.mac_address; + row.insertCell(4).textContent = sensor.description; + + // Insert location cell with corresponding location name + const locationCell = row.insertCell(5); + locationCell.textContent = location ? location.location : 'Unknown'; + }); + }) + .catch(error => { + console.error('Error fetching sensor data:', error); + }); + } + + // Call the function to fetch and populate the table + fetchAndPopulateSensorTable(); + +$('#sensorForm').on('submit', function (e) { + e.preventDefault(); + + const id = $('#id').val(); + const sensor = $('#sensor').val(); + const user = req.session.jobTitle + const macAddress = $('#macAddress').val(); + const description = $('#description').val(); + const location = $('#location').val(); + + fetch('/api/v0/location/new', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'Authorization': '2-eb0c08b0-250a-4249-8a87-11141e2ff8fb' + }, + body: JSON.stringify({ + id: id, + sensorname: sensor, + added_by: user, + mac_address: macAddress, + description: description, + location: location + }), + }) + .then(response => { + if (response.ok) { + // Status 201 indicates successful creation + return response.json(); + } else { + return response.json().then(data => { + throw new Error(data.message || `HTTP error! Status: ${response.status}`); + }); + } +}) +.then(data => { + console.log(`Sensor added successfully. Message: ${data.message}`); + alert('Sensor added successfully!'); + resetFormFields(); +}) +.catch(error => { + console.error('Location not added successfully', error); + // Handle error as needed +}); + }); + + function populateLocationDropdown() { + const locationDropdown = document.getElementById('locationDropdown'); + + // Clear existing options + locationDropdown.innerHTML = ''; + + // Add a default option + const defaultOption = document.createElement('option'); + defaultOption.text = 'Select a Location'; + defaultOption.value = ''; + locationDropdown.add(defaultOption); + + // Add locations as options + locationsArray.forEach(location => { + const option = document.createElement('option'); + option.text = location.location; + option.value = location.id; + locationDropdown.add(option); + }); +} + +// Call the function to populate the dropdown when the page loads +populateLocationDropdown(); \ No newline at end of file diff --git a/Sean/views/sensors.ejs b/Sean/views/sensors.ejs new file mode 100644 index 0000000..59385f0 --- /dev/null +++ b/Sean/views/sensors.ejs @@ -0,0 +1,87 @@ + + + + + + + + + Home + + + + + + +
+

ECOSAVER MANAGEMENT

+
+ + + +
+

Welcome to the Sensor Page

+
+
+ + + + + + + + + + + + +
IDSensor NameAdded ByMac AddressDescriptionLocation
+
+ + + + + + + \ No newline at end of file diff --git a/Sean/views/style.css b/Sean/views/style.css index f39a774..bc86630 100644 --- a/Sean/views/style.css +++ b/Sean/views/style.css @@ -556,4 +556,5 @@ footer { font-weight: bold; /* Make condition labels bold */ } + \ No newline at end of file