Switched mysql from connection to pool, Replaced connect-flash with build-in code

routes/index.js

@@ -1,64 +1,54 @@
 var express = require('express');
 
 var router = express.Router();
+var DBPool = require('../database');
 
-var database = require('../database');
-
-router.get("/", function(request, response, next){
-
-	var query = "SELECT * FROM Rides ORDER BY id DESC";
-
-	database.query(query, function(error, data){
-
-		if(error)
-		{
-			throw error; 
-		}
-		else
-		{
-			response.render('index', {title:'BikeRides', action:'list', TheData:data, message:request.flash('error')});
-		}
-
-	});
-
+router.get('/', async function (req, res) {
+  try {
+    const query = 'SELECT * FROM Rides ORDER BY id DESC';
+    const [data] = await DBPool.query(query);
+	let successMessages = "";
+	if (req.session && req.session.flashMessage) {
+		successMessages = req.session.flashMessage.success || "";
+		delete req.session.flashMessage.success;
+	}
+		res.render('index', {title: 'BikeRides',action: 'list',TheData: data,message:successMessages});
+  } catch (error) {
+    console.error(error);
+    res.status(500).send('Error');
+  }
 });
 
-router.get('/view/:id', function(request, response, next){
+router.get('/view/:id', async (req, res) => {
 
-	var id = request.params.id;
+	try {
+		var id = req.params.id;
+		var query = `SELECT * FROM Rides WHERE id = "${id}"`;
 
-	var query = `SELECT * FROM Rides WHERE id = "${id}"`;
-
-	database.query(query, function(error, data){
-		response.render('index', {title: 'View ride', action:'view', data:data[0]});
-
-	});
+		const [data] = await DBPool.query(query);
+		res.render('index', {title: 'View ride', action:'view', data:data[0]});
+	} catch (error) {
+		console.error(error); res.status(500).send("Error");
+	}
 
 });
 
 
-router.get('/delete/:id', function(request, response, next){
+router.get('/delete/:id', async function(req, res){
+	try {
+		var id = req.params.id;
+		var query = `DELETE FROM Rides WHERE id = "${id}"`;
 
-	var id = request.params.id; 
-
-	var query = `
-	DELETE FROM Rides WHERE id = "${id}"
-	`;
-
-	database.query(query, function(error, data){
-
-		if(error)
-		{
-			throw error;
-		}
-		else
-		{
-			request.flash('error', 'Ride removed');
-			response.redirect("/");
-		}
-
-	});
+		await DBPool.query(query);
+		req.session = req.session || {};
+		req.session.flashMessage = req.session.flashMessage || {};
+		req.session.flashMessage.success = ('Ride removed');
 
+		res.redirect("/");
+	} catch (error) {
+		console.error(error); throw error;;
+	}
+	
 });
 
 module.exports = router;