diff --git a/IoT-sensor/index.js b/IoT-sensor/index.js index b602b62..728cb30 100644 --- a/IoT-sensor/index.js +++ b/IoT-sensor/index.js @@ -18,7 +18,7 @@ client.on("connect", () => { client.on("end", () => { console.log("Disconnected from MQTT broker"); - client.reconnect = true; + client.reconnect(); }); client.on("error", (err) => { @@ -32,3 +32,7 @@ setInterval(publishData, 900000); //setInterval(publishData, 60000); + + + + diff --git a/consumerWebsite/database/model/apiKeyModel.js b/consumerWebsite/database/model/apiKeyModel.js new file mode 100644 index 0000000..e9a2df4 --- /dev/null +++ b/consumerWebsite/database/model/apiKeyModel.js @@ -0,0 +1,66 @@ +"use strict"; +const { Sequelize, DataTypes } = require("sequelize"); +const { sequelize } = require("../mySQL"); +const { userModel } = require("./userModel"); + +sequelize.sync(); +const apikeyModel = sequelize.define( + "apikey", + { + id: { + type: DataTypes.INTEGER, + allowNull: true, + primaryKey: true, + autoIncrement: true, + validate: { + isNumeric: true, + }, + }, + userid:{ + type: DataTypes.INTEGER, + allowNull: false, + validate: { + isNumeric: true, + }, + //fk + references: { + model: userModel, + key: "id", + }, + }, + apikey: { + type: DataTypes.STRING, + allowNull: false, + length: 255, + unique: true, + validate: { + notEmpty: true, + len: [1, 255], + }, + }, + permission: { + type: DataTypes.STRING, + allowNull: false, + length: 255, + validate: { + notEmpty: true, + len: [1, 255], + isIn: [['canRead' , 'canWrite']], + }, + }, + createdAt: { + type: DataTypes.DATE, + allowNull: true, + }, + updatedAt: { + type: DataTypes.DATE, + allowNull: true, + }, + }, + { + timestamps: true, + } + +) + +module.exports = { apikeyModel }; diff --git a/consumerWebsite/database/model/userModel.js b/consumerWebsite/database/model/userModel.js new file mode 100644 index 0000000..f9b3fee --- /dev/null +++ b/consumerWebsite/database/model/userModel.js @@ -0,0 +1,94 @@ +"use strict"; +const { Sequelize, DataTypes } = require("sequelize"); +const { sequelize } = require("../mySQL"); +const { + isAlphaNumericWithSpacesAndDash, + isAddress, +} = require("../../functions/validateData"); + +sequelize.sync(); +const userModel = sequelize.define( + "user", + { + id: { + type: DataTypes.INTEGER, + allowNull: true, + primaryKey: true, + autoIncrement: true, + validate: { + isNumeric: true, + }, + }, + username: { + type: DataTypes.STRING, + allowNull: false, + length: 60, + validate: { + notEmpty: true, + len: [1, 60], + isAlphaNumericWithSpacesAndDash(value) { + if (!isAlphaNumericWithSpacesAndDash(value)) { + throw new Error("Invalid characters in username"); + } + }, + }, + }, + password: { + type: DataTypes.STRING, + allowNull: false, + length: 255, + validate: { + notEmpty: true, + len: [1, 255], + }, + }, + email: { + type: DataTypes.STRING, + allowNull: false, + length: 60, + unique: true, + validate: { + notEmpty: true, + len: [1, 60], + isEmail: true, + }, + }, + address: { + type: DataTypes.STRING, + allowNull: true, + length: 255, + validate: { + notEmpty: true, + len: [1, 255], + isAddress(value) { + if (!isAddress(value)) { + throw new Error("Invalid address"); + } + }, + }, + }, + phone: { + type: DataTypes.STRING, + allowNull: true, + length: 20, + validate: { + notEmpty: true, + len: [1, 20], + isNumeric: true, + }, + }, + //utc time + createdAt: { + type: DataTypes.DATE, + allowNull: true, + }, + updatedAt: { + type: DataTypes.DATE, + allowNull: true, + }, + }, + { + timestamps: true, + } +); +module.exports = { userModel }; diff --git a/consumerWebsite/database/mySQL.js b/consumerWebsite/database/mySQL.js new file mode 100644 index 0000000..255dc3a --- /dev/null +++ b/consumerWebsite/database/mySQL.js @@ -0,0 +1,34 @@ +const dotenv = require("dotenv"); +const path = require('path') +require('dotenv').config({ path: path.resolve(__dirname, '../../.env') }) +const Sequelize = require("sequelize"); +const fs = require('fs'); + +const sequelize = new Sequelize( + "eco_saver", + process.env.DB_USER, + process.env.DB_PASS, + { + host: "mpsqldatabase.mysql.database.azure.com", + dialect: 'mysql', + // attributeBehavior?: 'escape' | 'throw' | 'unsafe-legacy'; + attributeBehavior: 'escape', + dialectOptions: { + ssl: { + ca: fs.readFileSync(path.resolve(__dirname, '../cert/DigiCertGlobalRootCA.crt.pem')), + }, + + }, + }, + + +); + +sequelize.authenticate().then(() => { + console.log('Connection has been established successfully.'); +}).catch((error) => { + console.error('Unable to connect to the database: ', error); +}); + +module.exports = { sequelize }; + diff --git a/Vivian/functions/validateData.js b/consumerWebsite/functions/validateData.js similarity index 57% rename from Vivian/functions/validateData.js rename to consumerWebsite/functions/validateData.js index 1fb5b0f..1849cb9 100644 --- a/Vivian/functions/validateData.js +++ b/consumerWebsite/functions/validateData.js @@ -9,7 +9,7 @@ function isAlphaNumericWithSpacesAndDash(value) { const alphanumeric = /^[a-zA-Z0-9]+$/; const valid = value .split("") - .every((char) => alphanumeric.test(char) || char === " " || char === "-"); + .every((char) => alphanumeric.test(char) || char === " " || char === "-" || char === "_"); return valid; } @@ -22,12 +22,25 @@ function isJson(value) { } +/* +//https://stackoverflow.com/questions/35145838/regex-for-singapore-addresses +2 Orchard Turn #B4-47 ION ORCHARD Singapore 238801 + +68 Marine Parade Road #03-26B parkway Parade 449269 + +Nanyang Polytechnic 180 Ang Mo Kio Avenue 8 Singapore 569830 +*/ +function isAddress(value){ + // (\d{1,3}.)?.+\s(\d{6})$ + const addressRegex = /^(\d{1,3}.)?.+\s(\d{6})$/; + //return true if it matches + return addressRegex.test(value); +} + module.exports = { - validateData, - isValidDateString, isAlphaNumericwithSpaces, isAlphaNumericWithSpacesAndDash, - isMacAddress, isJson, + isAddress }; diff --git a/Vivian/modules/app.js b/consumerWebsite/modules/app.js similarity index 100% rename from Vivian/modules/app.js rename to consumerWebsite/modules/app.js diff --git a/Leo/404.html b/consumerWebsite/public/404.html similarity index 100% rename from Leo/404.html rename to consumerWebsite/public/404.html diff --git a/Leo/contact.html b/consumerWebsite/public/contact.html similarity index 100% rename from Leo/contact.html rename to consumerWebsite/public/contact.html diff --git a/Leo/css/all.css b/consumerWebsite/public/css/all.css similarity index 100% rename from Leo/css/all.css rename to consumerWebsite/public/css/all.css diff --git a/Leo/css/style.css b/consumerWebsite/public/css/style.css similarity index 100% rename from Leo/css/style.css rename to consumerWebsite/public/css/style.css diff --git a/Leo/images/404.png b/consumerWebsite/public/images/404.png similarity index 100% rename from Leo/images/404.png rename to consumerWebsite/public/images/404.png diff --git a/Leo/images/about-img.jpg b/consumerWebsite/public/images/about-img.jpg similarity index 100% rename from Leo/images/about-img.jpg rename to consumerWebsite/public/images/about-img.jpg diff --git a/Leo/images/all-title-bg.jpg b/consumerWebsite/public/images/all-title-bg.jpg similarity index 100% rename from Leo/images/all-title-bg.jpg rename to consumerWebsite/public/images/all-title-bg.jpg diff --git a/Leo/images/blog-img-01.jpg b/consumerWebsite/public/images/blog-img-01.jpg similarity index 100% rename from Leo/images/blog-img-01.jpg rename to consumerWebsite/public/images/blog-img-01.jpg diff --git a/Leo/images/blog-img-02.jpg b/consumerWebsite/public/images/blog-img-02.jpg similarity index 100% rename from Leo/images/blog-img-02.jpg rename to consumerWebsite/public/images/blog-img-02.jpg diff --git a/Leo/images/blog-img-03.jpg b/consumerWebsite/public/images/blog-img-03.jpg similarity index 100% rename from Leo/images/blog-img-03.jpg rename to consumerWebsite/public/images/blog-img-03.jpg diff --git a/Leo/images/blog-img-04.jpg b/consumerWebsite/public/images/blog-img-04.jpg similarity index 100% rename from Leo/images/blog-img-04.jpg rename to consumerWebsite/public/images/blog-img-04.jpg diff --git a/Leo/images/blog-item-01.jpg b/consumerWebsite/public/images/blog-item-01.jpg similarity index 100% rename from Leo/images/blog-item-01.jpg rename to consumerWebsite/public/images/blog-item-01.jpg diff --git a/Leo/images/footer-logo.png b/consumerWebsite/public/images/footer-logo.png similarity index 100% rename from Leo/images/footer-logo.png rename to consumerWebsite/public/images/footer-logo.png diff --git a/Leo/images/logo.png b/consumerWebsite/public/images/logo.png similarity index 100% rename from Leo/images/logo.png rename to consumerWebsite/public/images/logo.png diff --git a/Leo/images/logo_01.png b/consumerWebsite/public/images/logo_01.png similarity index 100% rename from Leo/images/logo_01.png rename to consumerWebsite/public/images/logo_01.png diff --git a/Leo/images/logo_02.png b/consumerWebsite/public/images/logo_02.png similarity index 100% rename from Leo/images/logo_02.png rename to consumerWebsite/public/images/logo_02.png diff --git a/Leo/images/logo_03.png b/consumerWebsite/public/images/logo_03.png similarity index 100% rename from Leo/images/logo_03.png rename to consumerWebsite/public/images/logo_03.png diff --git a/Leo/images/logo_04.png b/consumerWebsite/public/images/logo_04.png similarity index 100% rename from Leo/images/logo_04.png rename to consumerWebsite/public/images/logo_04.png diff --git a/Leo/images/logo_05.png b/consumerWebsite/public/images/logo_05.png similarity index 100% rename from Leo/images/logo_05.png rename to consumerWebsite/public/images/logo_05.png diff --git a/Leo/images/logo_06.png b/consumerWebsite/public/images/logo_06.png similarity index 100% rename from Leo/images/logo_06.png rename to consumerWebsite/public/images/logo_06.png diff --git a/Leo/images/newspic.jpg b/consumerWebsite/public/images/newspic.jpg similarity index 100% rename from Leo/images/newspic.jpg rename to consumerWebsite/public/images/newspic.jpg diff --git a/Leo/images/portfolio-big-01.jpg b/consumerWebsite/public/images/portfolio-big-01.jpg similarity index 100% rename from Leo/images/portfolio-big-01.jpg rename to consumerWebsite/public/images/portfolio-big-01.jpg diff --git a/Leo/images/portfolio-big-02.jpg b/consumerWebsite/public/images/portfolio-big-02.jpg similarity index 100% rename from Leo/images/portfolio-big-02.jpg rename to consumerWebsite/public/images/portfolio-big-02.jpg diff --git a/Leo/images/portfolio-big-03.jpg b/consumerWebsite/public/images/portfolio-big-03.jpg similarity index 100% rename from Leo/images/portfolio-big-03.jpg rename to consumerWebsite/public/images/portfolio-big-03.jpg diff --git a/Leo/images/portfolio-big-04.jpg b/consumerWebsite/public/images/portfolio-big-04.jpg similarity index 100% rename from Leo/images/portfolio-big-04.jpg rename to consumerWebsite/public/images/portfolio-big-04.jpg diff --git a/Leo/images/portfolio-big-05.jpg b/consumerWebsite/public/images/portfolio-big-05.jpg similarity index 100% rename from Leo/images/portfolio-big-05.jpg rename to consumerWebsite/public/images/portfolio-big-05.jpg diff --git a/Leo/images/portfolio-big-Item.jpg b/consumerWebsite/public/images/portfolio-big-Item.jpg similarity index 100% rename from Leo/images/portfolio-big-Item.jpg rename to consumerWebsite/public/images/portfolio-big-Item.jpg diff --git a/Leo/images/portfolio-img-01.jpg b/consumerWebsite/public/images/portfolio-img-01.jpg similarity index 100% rename from Leo/images/portfolio-img-01.jpg rename to consumerWebsite/public/images/portfolio-img-01.jpg diff --git a/Leo/images/portfolio-img-02.jpg b/consumerWebsite/public/images/portfolio-img-02.jpg similarity index 100% rename from Leo/images/portfolio-img-02.jpg rename to consumerWebsite/public/images/portfolio-img-02.jpg diff --git a/Leo/images/portfolio-img-03.jpg b/consumerWebsite/public/images/portfolio-img-03.jpg similarity index 100% rename from Leo/images/portfolio-img-03.jpg rename to consumerWebsite/public/images/portfolio-img-03.jpg diff --git a/Leo/images/portfolio-img-04.jpg b/consumerWebsite/public/images/portfolio-img-04.jpg similarity index 100% rename from Leo/images/portfolio-img-04.jpg rename to consumerWebsite/public/images/portfolio-img-04.jpg diff --git a/Leo/images/portfolio-img-05.jpg b/consumerWebsite/public/images/portfolio-img-05.jpg similarity index 100% rename from Leo/images/portfolio-img-05.jpg rename to consumerWebsite/public/images/portfolio-img-05.jpg diff --git a/Leo/images/post-img-01.jpg b/consumerWebsite/public/images/post-img-01.jpg similarity index 100% rename from Leo/images/post-img-01.jpg rename to consumerWebsite/public/images/post-img-01.jpg diff --git a/Leo/images/post-img-02.jpg b/consumerWebsite/public/images/post-img-02.jpg similarity index 100% rename from Leo/images/post-img-02.jpg rename to consumerWebsite/public/images/post-img-02.jpg diff --git a/Leo/images/post-img-03.jpg b/consumerWebsite/public/images/post-img-03.jpg similarity index 100% rename from Leo/images/post-img-03.jpg rename to consumerWebsite/public/images/post-img-03.jpg diff --git a/Leo/images/profile-logo.png b/consumerWebsite/public/images/profile-logo.png similarity index 100% rename from Leo/images/profile-logo.png rename to consumerWebsite/public/images/profile-logo.png diff --git a/Leo/images/related-pro-01.jpg b/consumerWebsite/public/images/related-pro-01.jpg similarity index 100% rename from Leo/images/related-pro-01.jpg rename to consumerWebsite/public/images/related-pro-01.jpg diff --git a/Leo/images/related-pro-02.jpg b/consumerWebsite/public/images/related-pro-02.jpg similarity index 100% rename from Leo/images/related-pro-02.jpg rename to consumerWebsite/public/images/related-pro-02.jpg diff --git a/Leo/images/related-pro-03.jpg b/consumerWebsite/public/images/related-pro-03.jpg similarity index 100% rename from Leo/images/related-pro-03.jpg rename to consumerWebsite/public/images/related-pro-03.jpg diff --git a/Leo/images/related-pro-04.jpg b/consumerWebsite/public/images/related-pro-04.jpg similarity index 100% rename from Leo/images/related-pro-04.jpg rename to consumerWebsite/public/images/related-pro-04.jpg diff --git a/Leo/images/services-big.jpg b/consumerWebsite/public/images/services-big.jpg similarity index 100% rename from Leo/images/services-big.jpg rename to consumerWebsite/public/images/services-big.jpg diff --git a/Leo/images/services-img-01.jpg b/consumerWebsite/public/images/services-img-01.jpg similarity index 100% rename from Leo/images/services-img-01.jpg rename to consumerWebsite/public/images/services-img-01.jpg diff --git a/Leo/images/services-img-02.jpg b/consumerWebsite/public/images/services-img-02.jpg similarity index 100% rename from Leo/images/services-img-02.jpg rename to consumerWebsite/public/images/services-img-02.jpg diff --git a/Leo/images/services-img-03.jpg b/consumerWebsite/public/images/services-img-03.jpg similarity index 100% rename from Leo/images/services-img-03.jpg rename to consumerWebsite/public/images/services-img-03.jpg diff --git a/Leo/images/slider-01.jpg b/consumerWebsite/public/images/slider-01.jpg similarity index 100% rename from Leo/images/slider-01.jpg rename to consumerWebsite/public/images/slider-01.jpg diff --git a/Leo/images/slider-02.jpg b/consumerWebsite/public/images/slider-02.jpg similarity index 100% rename from Leo/images/slider-02.jpg rename to consumerWebsite/public/images/slider-02.jpg diff --git a/Leo/images/slider-03.jpg b/consumerWebsite/public/images/slider-03.jpg similarity index 100% rename from Leo/images/slider-03.jpg rename to consumerWebsite/public/images/slider-03.jpg diff --git a/Leo/images/team_01.jpg b/consumerWebsite/public/images/team_01.jpg similarity index 100% rename from Leo/images/team_01.jpg rename to consumerWebsite/public/images/team_01.jpg diff --git a/Leo/images/team_02.jpg b/consumerWebsite/public/images/team_02.jpg similarity index 100% rename from Leo/images/team_02.jpg rename to consumerWebsite/public/images/team_02.jpg diff --git a/Leo/images/team_03.jpg b/consumerWebsite/public/images/team_03.jpg similarity index 100% rename from Leo/images/team_03.jpg rename to consumerWebsite/public/images/team_03.jpg diff --git a/Leo/images/testi_01.png b/consumerWebsite/public/images/testi_01.png similarity index 100% rename from Leo/images/testi_01.png rename to consumerWebsite/public/images/testi_01.png diff --git a/Leo/images/testi_02.png b/consumerWebsite/public/images/testi_02.png similarity index 100% rename from Leo/images/testi_02.png rename to consumerWebsite/public/images/testi_02.png diff --git a/Leo/images/testi_03.png b/consumerWebsite/public/images/testi_03.png similarity index 100% rename from Leo/images/testi_03.png rename to consumerWebsite/public/images/testi_03.png diff --git a/Leo/index.html b/consumerWebsite/public/index.html similarity index 100% rename from Leo/index.html rename to consumerWebsite/public/index.html diff --git a/Leo/js/contact_me.js b/consumerWebsite/public/js/contact_me.js similarity index 100% rename from Leo/js/contact_me.js rename to consumerWebsite/public/js/contact_me.js diff --git a/Leo/js/jqBootstrapValidation.js b/consumerWebsite/public/js/jqBootstrapValidation.js similarity index 100% rename from Leo/js/jqBootstrapValidation.js rename to consumerWebsite/public/js/jqBootstrapValidation.js diff --git a/Leo/mail/contact_me.php b/consumerWebsite/public/mail/contact_me.php similarity index 100% rename from Leo/mail/contact_me.php rename to consumerWebsite/public/mail/contact_me.php diff --git a/Leo/news.html b/consumerWebsite/public/news.html similarity index 100% rename from Leo/news.html rename to consumerWebsite/public/news.html diff --git a/Leo/profile.html b/consumerWebsite/public/profile.html similarity index 100% rename from Leo/profile.html rename to consumerWebsite/public/profile.html diff --git a/Leo/vendor/bootstrap/css/bootstrap.min.css b/consumerWebsite/public/vendor/bootstrap/css/bootstrap.min.css similarity index 100% rename from Leo/vendor/bootstrap/css/bootstrap.min.css rename to consumerWebsite/public/vendor/bootstrap/css/bootstrap.min.css diff --git a/Leo/vendor/bootstrap/js/bootstrap.bundle.min.js b/consumerWebsite/public/vendor/bootstrap/js/bootstrap.bundle.min.js similarity index 100% rename from Leo/vendor/bootstrap/js/bootstrap.bundle.min.js rename to consumerWebsite/public/vendor/bootstrap/js/bootstrap.bundle.min.js diff --git a/Leo/vendor/jquery/jquery.min.js b/consumerWebsite/public/vendor/jquery/jquery.min.js similarity index 100% rename from Leo/vendor/jquery/jquery.min.js rename to consumerWebsite/public/vendor/jquery/jquery.min.js diff --git a/Leo/webfonts/fa-brands-400.eot b/consumerWebsite/public/webfonts/fa-brands-400.eot similarity index 100% rename from Leo/webfonts/fa-brands-400.eot rename to consumerWebsite/public/webfonts/fa-brands-400.eot diff --git a/Leo/webfonts/fa-brands-400.svg b/consumerWebsite/public/webfonts/fa-brands-400.svg similarity index 100% rename from Leo/webfonts/fa-brands-400.svg rename to consumerWebsite/public/webfonts/fa-brands-400.svg diff --git a/Leo/webfonts/fa-brands-400.ttf b/consumerWebsite/public/webfonts/fa-brands-400.ttf similarity index 100% rename from Leo/webfonts/fa-brands-400.ttf rename to consumerWebsite/public/webfonts/fa-brands-400.ttf diff --git a/Leo/webfonts/fa-brands-400.woff b/consumerWebsite/public/webfonts/fa-brands-400.woff similarity index 100% rename from Leo/webfonts/fa-brands-400.woff rename to consumerWebsite/public/webfonts/fa-brands-400.woff diff --git a/Leo/webfonts/fa-brands-400.woff2 b/consumerWebsite/public/webfonts/fa-brands-400.woff2 similarity index 100% rename from Leo/webfonts/fa-brands-400.woff2 rename to consumerWebsite/public/webfonts/fa-brands-400.woff2 diff --git a/Leo/webfonts/fa-regular-400.eot b/consumerWebsite/public/webfonts/fa-regular-400.eot similarity index 100% rename from Leo/webfonts/fa-regular-400.eot rename to consumerWebsite/public/webfonts/fa-regular-400.eot diff --git a/Leo/webfonts/fa-regular-400.svg b/consumerWebsite/public/webfonts/fa-regular-400.svg similarity index 100% rename from Leo/webfonts/fa-regular-400.svg rename to consumerWebsite/public/webfonts/fa-regular-400.svg diff --git a/Leo/webfonts/fa-regular-400.ttf b/consumerWebsite/public/webfonts/fa-regular-400.ttf similarity index 100% rename from Leo/webfonts/fa-regular-400.ttf rename to consumerWebsite/public/webfonts/fa-regular-400.ttf diff --git a/Leo/webfonts/fa-regular-400.woff b/consumerWebsite/public/webfonts/fa-regular-400.woff similarity index 100% rename from Leo/webfonts/fa-regular-400.woff rename to consumerWebsite/public/webfonts/fa-regular-400.woff diff --git a/Leo/webfonts/fa-regular-400.woff2 b/consumerWebsite/public/webfonts/fa-regular-400.woff2 similarity index 100% rename from Leo/webfonts/fa-regular-400.woff2 rename to consumerWebsite/public/webfonts/fa-regular-400.woff2 diff --git a/Leo/webfonts/fa-solid-900.eot b/consumerWebsite/public/webfonts/fa-solid-900.eot similarity index 100% rename from Leo/webfonts/fa-solid-900.eot rename to consumerWebsite/public/webfonts/fa-solid-900.eot diff --git a/Leo/webfonts/fa-solid-900.svg b/consumerWebsite/public/webfonts/fa-solid-900.svg similarity index 100% rename from Leo/webfonts/fa-solid-900.svg rename to consumerWebsite/public/webfonts/fa-solid-900.svg diff --git a/Leo/webfonts/fa-solid-900.ttf b/consumerWebsite/public/webfonts/fa-solid-900.ttf similarity index 100% rename from Leo/webfonts/fa-solid-900.ttf rename to consumerWebsite/public/webfonts/fa-solid-900.ttf diff --git a/Leo/webfonts/fa-solid-900.woff b/consumerWebsite/public/webfonts/fa-solid-900.woff similarity index 100% rename from Leo/webfonts/fa-solid-900.woff rename to consumerWebsite/public/webfonts/fa-solid-900.woff diff --git a/Leo/webfonts/fa-solid-900.woff2 b/consumerWebsite/public/webfonts/fa-solid-900.woff2 similarity index 100% rename from Leo/webfonts/fa-solid-900.woff2 rename to consumerWebsite/public/webfonts/fa-solid-900.woff2 diff --git a/Web-Server/Database/model/apiLogModel.js b/webserver/database/model/apiLogModel.js similarity index 100% rename from Web-Server/Database/model/apiLogModel.js rename to webserver/database/model/apiLogModel.js diff --git a/Web-Server/Database/model/locationModel.js b/webserver/database/model/locationModel.js similarity index 100% rename from Web-Server/Database/model/locationModel.js rename to webserver/database/model/locationModel.js diff --git a/Web-Server/Database/model/sensorDataModel.js b/webserver/database/model/sensorDataModel.js similarity index 100% rename from Web-Server/Database/model/sensorDataModel.js rename to webserver/database/model/sensorDataModel.js diff --git a/Web-Server/Database/model/sensorModel.js b/webserver/database/model/sensorModel.js similarity index 100% rename from Web-Server/Database/model/sensorModel.js rename to webserver/database/model/sensorModel.js diff --git a/Web-Server/Database/mySQL.js b/webserver/database/mySQL.js similarity index 100% rename from Web-Server/Database/mySQL.js rename to webserver/database/mySQL.js diff --git a/Web-Server/functions/APIDatabase.js b/webserver/functions/APIDatabase.js similarity index 100% rename from Web-Server/functions/APIDatabase.js rename to webserver/functions/APIDatabase.js diff --git a/Web-Server/functions/Database.js b/webserver/functions/Database.js similarity index 100% rename from Web-Server/functions/Database.js rename to webserver/functions/Database.js diff --git a/Web-Server/functions/getAPIKey.js b/webserver/functions/getAPIKey.js similarity index 100% rename from Web-Server/functions/getAPIKey.js rename to webserver/functions/getAPIKey.js diff --git a/Web-Server/functions/validateData.js b/webserver/functions/validateData.js similarity index 100% rename from Web-Server/functions/validateData.js rename to webserver/functions/validateData.js diff --git a/Web-Server/index.js b/webserver/index.js similarity index 98% rename from Web-Server/index.js rename to webserver/index.js index ee7fa3b..cf6da5d 100644 --- a/Web-Server/index.js +++ b/webserver/index.js @@ -62,5 +62,5 @@ client.on("error", (err) => { client.on("end", () => { console.log("Disconnected from MQTT broker"); - client.reconnect = true; + client.reconnect(); }); diff --git a/Web-Server/middleware/ApiKey.js b/webserver/middleware/apiKey.js similarity index 100% rename from Web-Server/middleware/ApiKey.js rename to webserver/middleware/apiKey.js diff --git a/Web-Server/middleware/ApiLogger.js b/webserver/middleware/apiLogger.js similarity index 100% rename from Web-Server/middleware/ApiLogger.js rename to webserver/middleware/apiLogger.js diff --git a/Web-Server/modules/express.js b/webserver/modules/express.js similarity index 100% rename from Web-Server/modules/express.js rename to webserver/modules/express.js diff --git a/Web-Server/modules/mqtt.js b/webserver/modules/mqtt.js similarity index 100% rename from Web-Server/modules/mqtt.js rename to webserver/modules/mqtt.js diff --git a/Web-Server/routes/Location.js b/webserver/routes/Location.js similarity index 100% rename from Web-Server/routes/Location.js rename to webserver/routes/Location.js diff --git a/Web-Server/routes/SeedLocationAndSensor.js b/webserver/routes/SeedLocationAndSensor.js similarity index 100% rename from Web-Server/routes/SeedLocationAndSensor.js rename to webserver/routes/SeedLocationAndSensor.js diff --git a/Web-Server/routes/SeedsensorData.js b/webserver/routes/SeedsensorData.js similarity index 100% rename from Web-Server/routes/SeedsensorData.js rename to webserver/routes/SeedsensorData.js diff --git a/Web-Server/routes/Sensor.js b/webserver/routes/Sensor.js similarity index 100% rename from Web-Server/routes/Sensor.js rename to webserver/routes/Sensor.js diff --git a/Web-Server/routes/SensorData.js b/webserver/routes/SensorData.js similarity index 100% rename from Web-Server/routes/SensorData.js rename to webserver/routes/SensorData.js diff --git a/Web-Server/routes/api_route.js b/webserver/routes/api_route.js similarity index 100% rename from Web-Server/routes/api_route.js rename to webserver/routes/api_route.js diff --git a/Web-Server/routes/seed_route.js b/webserver/routes/seed_route.js similarity index 100% rename from Web-Server/routes/seed_route.js rename to webserver/routes/seed_route.js