From 54e29877625d0e9349293d627c8c84c162665abc Mon Sep 17 00:00:00 2001
From: Leo <95978312+yaefdb@users.noreply.github.com>
Date: Sat, 27 Jan 2024 16:03:23 +0800
Subject: [PATCH] upload

---
 consumerWebsite/app.js             |  2 +-
 consumerWebsite/database/mySQL.js  |  4 +--
 consumerWebsite/views/test.html    | 48 ------------------------------
 consumerWebsite/views/viewdata.ejs |  2 +-
 4 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 consumerWebsite/views/test.html
diff --git a/consumerWebsite/app.js b/consumerWebsite/app.js
index b214bc3..e6ce391 100644
--- a/consumerWebsite/app.js
+++ b/consumerWebsite/app.js
@@ -7,7 +7,7 @@ const ejs = require("ejs");
 
 module.exports = app;
 
-process.nextTick(() => require("./mqttApp"));
+//process.nextTick(() => require("./mqttApp"));
 
 app.use(express.json());
 app.set("json spaces", 2);
diff --git a/consumerWebsite/database/mySQL.js b/consumerWebsite/database/mySQL.js
index 6bba43b..cb3d6fc 100644
--- a/consumerWebsite/database/mySQL.js
+++ b/consumerWebsite/database/mySQL.js
@@ -6,8 +6,8 @@ const fs = require('fs');
 
 const sequelize = new Sequelize(
  "eco_saver",
- process.env.DB_USER,
- process.env.DB_PASS,
+ "DB_USER='mpuser",
+ "DB_PASS='majorprojectpassword1234!",
  {
     host: "mpsqldatabasean.mysql.database.azure.com",
     dialect: 'mysql',
diff --git a/consumerWebsite/views/test.html b/consumerWebsite/views/test.html
deleted file mode 100644
index 3318de7..0000000
--- a/consumerWebsite/views/test.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>PM2.5 Sub-Index Over Time</title>
-    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-</head>
-<body>
-    <canvas id="pm25Chart"></canvas>
-
-    <script>
-        const ctx = document.getElementById('pm25Chart').getContext('2d');
-
-        const pm25Data = [37, 38, 39, 40, 41, 39, 38];
-        const timestamps = ["4pm", "7pm", "11pm", "3am", "7am", "11am", "3pm"];
-
-        const myChart = new Chart(ctx, {
-            type: 'line',
-            data: {
-                labels: timestamps,
-                datasets: [{
-                    label: 'PM2.5 Sub-Index',
-                    data: pm25Data,
-                    backgroundColor: 'rgba(255, 99, 132, 0.2)',
-                    borderColor: 'rgba(255, 99, 132, 1)',
-                    pointRadius: 5,
-                    pointHitRadius: 10,
-                }]
-            },
-            options: {
-                responsive: true,
-                title: {
-                    display: true,
-                    text: 'PM2.5 Sub-Index Over Time'
-                },
-                scales: {
-                    yAxes: [{
-                        ticks: {
-                            beginAtZero: true
-                        }
-                    }]
-                }
-            }
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/consumerWebsite/views/viewdata.ejs b/consumerWebsite/views/viewdata.ejs
index 7e14ccb..3567e45 100644
--- a/consumerWebsite/views/viewdata.ejs
+++ b/consumerWebsite/views/viewdata.ejs
@@ -4,7 +4,7 @@
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 <br>
 <br>
-<br>
+
 
 <body>
 
