arrange code , change port
This commit is contained in:
parent
619c429d36
commit
97c5918c69
35
main.js
35
main.js
|
@ -5,7 +5,7 @@ const mysql = require("mysql2/promise");
|
||||||
const config = require("./config/db.config.js");
|
const config = require("./config/db.config.js");
|
||||||
const session = require('express-session');
|
const session = require('express-session');
|
||||||
|
|
||||||
const PORT = process.env.PORT || 5000; // Default port is 5000
|
const PORT = process.env.PORT || 8080; // Default port is 5000
|
||||||
|
|
||||||
const log = {
|
const log = {
|
||||||
yellow: '\x1b[33m%s\x1b[0m', //yellow
|
yellow: '\x1b[33m%s\x1b[0m', //yellow
|
||||||
|
@ -30,7 +30,6 @@ const pool = mysql.createPool({
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
|
|
||||||
app.set('view engine', 'ejs');
|
app.set('view engine', 'ejs');
|
||||||
|
@ -54,11 +53,7 @@ app.get('/x', function(request, response) {
|
||||||
console.log(request.session.username, 'open main page');
|
console.log(request.session.username, 'open main page');
|
||||||
// Render home page with username
|
// Render home page with username
|
||||||
response.render('home', { username: request.session.username });
|
response.render('home', { username: request.session.username });
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Not logged in
|
|
||||||
// response.send('Please login to view this page!');
|
// response.send('Please login to view this page!');
|
||||||
response.redirect('/login');
|
response.redirect('/login');
|
||||||
}
|
}
|
||||||
|
@ -68,10 +63,6 @@ app.get('/login', function(request, response) {
|
||||||
/// Render login template with any message from query parameters
|
/// Render login template with any message from query parameters
|
||||||
console.log('Message:', request.query.message); // Log the message
|
console.log('Message:', request.query.message); // Log the message
|
||||||
response.render('login', { message: request.query.message || '' });
|
response.render('login', { message: request.query.message || '' });
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// response.sendFile(path.join(__dirname + '/login.html'));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -84,21 +75,10 @@ app.post('/auth', async function(request, response) {
|
||||||
try {
|
try {
|
||||||
// Get a connection from the pool
|
// Get a connection from the pool
|
||||||
const connection = await pool.getConnection();
|
const connection = await pool.getConnection();
|
||||||
|
|
||||||
// Execute SQL query
|
|
||||||
// const [rows] = await connection.execute(
|
|
||||||
// 'SELECT * FROM accounts WHERE username = ? AND password = ?',
|
|
||||||
// [username, password]
|
|
||||||
// );
|
|
||||||
|
|
||||||
const [rows] = await connection.execute(
|
const [rows] = await connection.execute(
|
||||||
'SELECT * FROM accounts WHERE (username = ? OR email = ?) AND password = ?',
|
'SELECT * FROM accounts WHERE (username = ? OR email = ?) AND password = ?',
|
||||||
[login, login, password]
|
[login, login, password]
|
||||||
);
|
);
|
||||||
|
|
||||||
// console.log(rows);
|
|
||||||
|
|
||||||
|
|
||||||
// Release the connection back to the pool
|
// Release the connection back to the pool
|
||||||
connection.release();
|
connection.release();
|
||||||
|
|
||||||
|
@ -108,10 +88,7 @@ app.post('/auth', async function(request, response) {
|
||||||
request.session.loggedin = true;
|
request.session.loggedin = true;
|
||||||
request.session.username = rows[0].username;
|
request.session.username = rows[0].username;
|
||||||
request.session.avatar = rows[0].avatar;
|
request.session.avatar = rows[0].avatar;
|
||||||
// request.session.username = username;
|
|
||||||
// Redirect to home page
|
// Redirect to home page
|
||||||
console.log(rows);
|
|
||||||
|
|
||||||
response.redirect('/');
|
response.redirect('/');
|
||||||
} else {
|
} else {
|
||||||
response.redirect('/login?message=Incorrect Username and/or Password!');
|
response.redirect('/login?message=Incorrect Username and/or Password!');
|
||||||
|
@ -124,7 +101,6 @@ app.post('/auth', async function(request, response) {
|
||||||
// response.send('Please enter Username and Password!');
|
// response.send('Please enter Username and Password!');
|
||||||
response.redirect('/login?message=Please enter Username and Password!');
|
response.redirect('/login?message=Please enter Username and Password!');
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -132,16 +108,12 @@ app.post('/auth', async function(request, response) {
|
||||||
app.get('/', function (request, response) {
|
app.get('/', function (request, response) {
|
||||||
// If the user is loggedin
|
// If the user is loggedin
|
||||||
if (request.session.loggedin) {
|
if (request.session.loggedin) {
|
||||||
// Output username
|
|
||||||
// response.send('Welcome back, ' + request.session.username + '!');
|
|
||||||
|
|
||||||
let avatarSrc = '';
|
let avatarSrc = '';
|
||||||
if (request.session.avatar) {
|
if (request.session.avatar) {
|
||||||
// Convert BLOB to Base64 if it exists
|
// Convert BLOB to Base64 if it exists
|
||||||
const avatarBase64 = Buffer.from(request.session.avatar).toString('base64');
|
const avatarBase64 = Buffer.from(request.session.avatar).toString('base64');
|
||||||
avatarSrc = `data:image/jpeg;base64,${avatarBase64}`; // Adjust MIME type as necessary
|
avatarSrc = `data:image/jpeg;base64,${avatarBase64}`; // Adjust MIME type as necessary
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render home page with username
|
// Render home page with username
|
||||||
response.render('home', {
|
response.render('home', {
|
||||||
username: request.session.username,
|
username: request.session.username,
|
||||||
|
@ -149,7 +121,6 @@ app.get('/', function(request, response) {
|
||||||
});
|
});
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Not logged in
|
|
||||||
// response.send('Please login to view this page!');
|
// response.send('Please login to view this page!');
|
||||||
response.redirect('/login');
|
response.redirect('/login');
|
||||||
}
|
}
|
||||||
|
@ -157,9 +128,7 @@ app.get('/', function(request, response) {
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// http://localhost:8080/logout
|
||||||
|
|
||||||
// http://localhost:3000/logout
|
|
||||||
app.get('/logout', function (request, response) {
|
app.get('/logout', function (request, response) {
|
||||||
request.session.destroy((err) => {
|
request.session.destroy((err) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
Loading…
Reference in New Issue