diff --git a/Database/model/adminUserModel.js b/Database/model/adminUserModel.js new file mode 100644 index 0000000..4c98c66 --- /dev/null +++ b/Database/model/adminUserModel.js @@ -0,0 +1,45 @@ +'use strict'; +const { Sequelize, DataTypes } = require('sequelize'); +const { sequelize } = require("../mySQL.js") + +const adminUserModel = sequelize.define('adminusers', { + // Model attributes are defined here + id: { + type: DataTypes.INTEGER, + allowNull: false, + primaryKey: true + }, + name: { + type: DataTypes.STRING, + allowNull: true, + length: 255 + }, + username: { + type: DataTypes.STRING, + allowNull: true, + length: 50 + }, + email: { + type: DataTypes.STRING, + allowNull: true, + length: 255 + }, + password: { + type: DataTypes.STRING, + allowNull: true, + length: 255 + }, + lastLogin: { + type: DataTypes.timestamps, + allowNull: true, + }, + jobTitle: { + type: DataTypes.STRING, + allowNull: true, + length: 255 + } + },{ + timestamps: false, // Disable automatic timestamps + }); + +module.exports = { adminUserModel } \ No newline at end of file diff --git a/Database/model/userMode.js b/Database/model/userMode.js new file mode 100644 index 0000000..785e19a --- /dev/null +++ b/Database/model/userMode.js @@ -0,0 +1,40 @@ +'use strict'; +const { Sequelize, DataTypes } = require('sequelize'); +const { sequelize } = require("../mySQL.js") + +const userModel = sequelize.define('users', { + // Model attributes are defined here + id: { + type: DataTypes.INTEGER, + allowNull: false, + primaryKey: true + }, + name: { + type: DataTypes.STRING, + allowNull: true, + length: 255 + }, + username: { + type: DataTypes.STRING, + allowNull: true, + length: 50 + }, + email: { + type: DataTypes.STRING, + allowNull: true, + length: 255 + }, + password: { + type: DataTypes.STRING, + allowNull: true, + length: 255 + }, + lastLogin: { + type: DataTypes.timestamps, + allowNull: true, + } + },{ + timestamps: false, // Disable automatic timestamps + }); + +module.exports = { userModel } \ No newline at end of file diff --git a/Database/mySQL.js b/Database/mySQL.js index 083d5c2..cb69131 100644 --- a/Database/mySQL.js +++ b/Database/mySQL.js @@ -1,16 +1,16 @@ -require("dotenv").config({ path: "../../.env" }); +require("dotenv").config({ path: "../.env" }); const Sequelize = require("sequelize"); const sequelize = new Sequelize( - "your_database_name", - process.env. - process.env., -{ - host: '', - dialect: 'mysql' - } -); + "adminusers", + process.env.DB_USER, + process.env.DB_PASS, + { + host: "mpsqldatabasean.mysql.database.azure.com", + dialect: 'mysql' + } +); sequelize.authenticate().then(() => { console.log('Connection has been established successfully.'); diff --git a/Sean/server.js b/Sean/server.js index 3708fdc..7b77c86 100644 --- a/Sean/server.js +++ b/Sean/server.js @@ -7,7 +7,6 @@ const app = express(); const PORT = process.env.PORT || 3000; require('dotenv').config() -// MySQL setup (replace with your MySQL connection details) const mysqlConfig = { host: process.env.host, user: process.env.user, @@ -38,7 +37,7 @@ function isAuthenticated(req, res, next) { app.post('/login', (req, res) => { let { username, password } = req.body; - // Trim leading and trailing spaces from username + // Trim whitespace username = username.trim(); // Validate username and password against MySQL