From 93afda6d10ece2a617ebc8423ddd73736e8e94fc Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 24 May 2024 12:09:09 -0400 Subject: [PATCH] Fixed errors caught by linter --- index.js | 2 +- src/routes/search.js | 16 ++++++++-------- views/search.twig | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/index.js b/index.js index 191ff2e..08b71fd 100644 --- a/index.js +++ b/index.js @@ -8,7 +8,7 @@ const app = express(); const config = require('config'); // initialize database connection -const db = require('./src/models'); +require('./src/models'); if (config.get('use_redis')) { // initialize Redis store for session data diff --git a/src/routes/search.js b/src/routes/search.js index ec7db7b..0ba9937 100644 --- a/src/routes/search.js +++ b/src/routes/search.js @@ -1,19 +1,19 @@ const db = require('../models'); const Item = db.items; const License = db.licenses; -const { Op } = require('sequelize'); +const {Op} = require('sequelize'); // GET - /search exports.getSearch = async function(req, res) { // decode URL search query - let query = req.query.query; + const query = req.query.query; // fetch inventory items from database based on search query - const item_results = await Item.findAll({ + const itemResults = await Item.findAll({ where: { name: { [Op.like]: '%' + query + '%', - } + }, }, limit: 10, order: [ @@ -22,11 +22,11 @@ exports.getSearch = async function(req, res) { }); // fetch licenses from database based on search query - const license_results = await License.findAll({ + const licenseResults = await License.findAll({ where: { name: { [Op.like]: '%' + query + '%', - } + }, }, limit: 10, order: [ @@ -36,7 +36,7 @@ exports.getSearch = async function(req, res) { res.render('search.twig', { query: query, - item_results: item_results, - license_results: license_results, + itemResults: itemResults, + licenseResults: licenseResults, }); }; diff --git a/views/search.twig b/views/search.twig index 15c5b68..16d5645 100644 --- a/views/search.twig +++ b/views/search.twig @@ -11,7 +11,7 @@ -{% if item_results|length > 0 %} +{% if itemResults|length > 0 %}

Hardware components:

@@ -24,7 +24,7 @@ - {% for item in item_results %} + {% for item in itemResults %} {{ item.name }} {{ item.type }} @@ -37,7 +37,7 @@
{% endif %} -{% if license_results|length > 0 %} +{% if licenseResults|length > 0 %}

Software licenses:

@@ -50,7 +50,7 @@ - {% for license in license_results %} + {% for license in licenseResults %} {{ license.name }} {{ license.manufacturer }}