From a96c3bc9177ef34d76a616f61eaf4f9a64ead363 Mon Sep 17 00:00:00 2001 From: Bobby Date: Mon, 25 Apr 2022 15:27:15 -0400 Subject: render ejs template --- interface/controllers/citizens.controller.js | 10 +---- interface/models/index.js | 3 +- interface/routes/index.js | 10 ++++- interface/server.js | 5 +++ interface/views/index.ejs | 66 ++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 interface/views/index.ejs diff --git a/interface/controllers/citizens.controller.js b/interface/controllers/citizens.controller.js index fef549d..64522b1 100644 --- a/interface/controllers/citizens.controller.js +++ b/interface/controllers/citizens.controller.js @@ -3,15 +3,9 @@ const citizens = db.citizens; const op = db.Sequelize.Op; // Retrieve all citizens from the database. Limit the number of citizens returned to 10. -exports.findXCitizens = (req, res) => { +exports.findXCitizens = () => { const limit = 10; - citizens.findAll({ + return citizens.findAll({ limit: limit - }).then(citizens => { - res.send(citizens); - }).catch(err => { - res.status(500).send({ - message: err.message || "Some error occurred while retrieving citizens." - }); }); } diff --git a/interface/models/index.js b/interface/models/index.js index 6a07907..852fb65 100644 --- a/interface/models/index.js +++ b/interface/models/index.js @@ -12,7 +12,8 @@ const sequelize = new Sequelize(databaseConfig.database, databaseConfig.username }, define: { timestamps: false - } + }, + logging: false }); const db = {}; db.Sequelize = Sequelize; diff --git a/interface/routes/index.js b/interface/routes/index.js index 60155eb..17c2021 100644 --- a/interface/routes/index.js +++ b/interface/routes/index.js @@ -3,7 +3,15 @@ const router = express.Router(); const citizensController = require("../controllers/citizens.controller"); // Setup Hello World route -router.get("/", citizensController.findXCitizens); +router.get("/", (req, res) => { + // Get the citizens from the database + citizensController.findXCitizens().then(citizens => { + res.render("index", { + citizens: citizens, + title: "Hello World" + }); + }); +}); // export the router module.exports = router; diff --git a/interface/server.js b/interface/server.js index ff88e45..4173d2f 100644 --- a/interface/server.js +++ b/interface/server.js @@ -8,6 +8,11 @@ app.use(cors()); app.use(express.json()); app.use(express.urlencoded({ extended: true })); +// Set view engine to ejs +app.set("view engine", "ejs"); +app.set("views", "./views"); +app.use(express.static("./public")); + // Import routes const routes = require("./routes"); app.use("/", routes); diff --git a/interface/views/index.ejs b/interface/views/index.ejs new file mode 100644 index 0000000..d7e0c5f --- /dev/null +++ b/interface/views/index.ejs @@ -0,0 +1,66 @@ + + + + + + + Document + + + + +

<%= title %>

+ + + + + + + + + + + + + + + + + + + + + <% for(var i=0; i < citizens.length; i++) { %> + + + + + + + + + + + + + + + + <% } %> + +

Citizen ID	First Name	Middle Name	Last Name	Address	Mobile Number	Date of Birth	Gender	Marital Status	Disabled	Disabled Percentage	Caste	Village ID
<%= citizens[i].citizen_id %>	<%= citizens[i].first_name %>	<%= citizens[i].middle_name ? citizens[i].middle_name : '-' %>	<%= citizens[i].last_name %>	<%= citizens[i].address %>	<%= citizens[i].mobile_num %>	<%= citizens[i].dob %>	<%= citizens[i].gender %>	<%= citizens[i].marital_status %>	<%= citizens[i].disabled %>	<%= citizens[i].disbaled_percentage %>	<%= citizens[i].caste %>	<%= citizens[i].village_id %>

+ + + -- cgit v1.2.3