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