Additional Information - ${region}
-
View Data
Air Quality Index:
${aqi}
@@ -28,14 +25,6 @@ document.addEventListener("DOMContentLoaded", function () {
Humidity:
${humidity}
-
- PM2.5:
- ${pm25}
-
-
- PM10:
- ${pm10}
-
SO2:
${so2}
@@ -54,21 +43,6 @@ document.addEventListener("DOMContentLoaded", function () {
`;
- var viewDataButton = document.getElementById("viewData");
-
- // Add a click event listener to the button
- viewDataButton.addEventListener("click", function () {
- // Redirect to the "viewdata.ejs" page
- window.location.href = "/viewdata";
- });
-
- // Remove the 'active' class from all info-box elements
- const infoBoxes = document.querySelectorAll('.info-box');
- infoBoxes.forEach(box => box.classList.remove('active'));
-
- // Add the 'active' class to the clicked info-box
- const clickedBox = document.getElementById(region.toLowerCase());
- clickedBox.classList.add('active');
}
diff --git a/consumerWebsite/routes/token.js b/consumerWebsite/routes/token.js
index 18b8df0..cace94a 100644
--- a/consumerWebsite/routes/token.js
+++ b/consumerWebsite/routes/token.js
@@ -1,9 +1,7 @@
-const { addToken } = require("../functions/api");
-const { checkEmail , getUserByEmail } = require("../functions/user");
+const { addToken, checkToken } = require("../functions/api");
+const { checkEmail, getUserByEmail } = require("../functions/user");
const { sendTokenEmail } = require("../functions/nodeMail");
-
-
const express = require("express");
const router = express.Router();
@@ -14,7 +12,7 @@ const router = express.Router();
4) store the api key in database
*/
//token/new
-//curl localhost:3000/api/v0/token/new -H "Content-Type: application/json" -X POST -d
+//curl localhost:3000/api/v0/token/new -H "Content-Type: application/json" -X POST -d
//'{"userid": "5", "permission": "canRead" ,}'
router.post("/new", async (req, res, next) => {
try {
@@ -24,29 +22,33 @@ router.post("/new", async (req, res, next) => {
let error = new Error("Email not found");
error.status = 400;
return next(error);
- }
- else
- {
- //console.log("email found");
+ } else {
let userid = await getUserByEmail(req.body.email);
if (!userid) return false;
-
- const token = await addToken(userid.id, "canRead" , "2204-01-24 07:34:36" );
- if (!token) return false;
- sendTokenEmail(req.body.email, token);
- res.json({
- message: "Token generated successfully and sent to email",
- })
-
+
+ const tokenRes = await checkToken(userid.id);
+ if (tokenRes.isKey !== "null" && tokenRes.isKey !== "isKey") {
+ //allow user to create token
+ const token = await addToken(
+ userid.id,
+ "canRead",
+ "isKey",
+ "2204-01-24 07:34:36"
+ );
+ if (!token) return false;
+ sendTokenEmail(req.body.email, token);
+ res.json({
+ message: "Token generated successfully and sent to email",
+ });
+ }
}
- //const token = await addToken(req.body.userid, "canRead" , "2204-01-24 07:34:36" );
- //res.json({token: token});
+
+ //const token = await addToken(req.body.userid, "canRead" , "2204-01-24 07:34:36" );
+ //res.json({token: token});
} catch (error) {
console.error(error);
next(error);
}
});
-
module.exports = router;
-
diff --git a/consumerWebsite/routes/user.js b/consumerWebsite/routes/user.js
index a7cf3b6..e81ac90 100644
--- a/consumerWebsite/routes/user.js
+++ b/consumerWebsite/routes/user.js
@@ -7,7 +7,7 @@ const router = express.Router();
//getbyid
router.get("/me", async function (req, res, next) {
try {
- let user = await getUserByID(req.user);
+ let user = await getUserByID(req.user); //req.user assigned in middleware!
//console.log(user);
res.json({
user: user,
diff --git a/consumerWebsite/views/api.ejs b/consumerWebsite/views/api.ejs
index de88786..f265e1f 100644
--- a/consumerWebsite/views/api.ejs
+++ b/consumerWebsite/views/api.ejs
@@ -41,14 +41,14 @@