diff --git a/app.js b/app.js index b9c5bf4..871c4a3 100644 --- a/app.js +++ b/app.js @@ -1,4 +1,5 @@ var createError = require('http-errors'); +var compression = require('compression'); var express = require('express'); var path = require('path'); var logger = require('morgan'); @@ -39,6 +40,7 @@ var corsOptions = { methods: ['GET', 'PUT', 'POST', 'DELETE', 'COPY'] } app.use(cors(corsOptions)); +app.use(compression); // Setting up passport diff --git a/db/index.js b/db/index.js index 4d43d0f..37ca77a 100644 --- a/db/index.js +++ b/db/index.js @@ -1,7 +1,7 @@ // SQL-Class // Author: Thomas Mack -const DEBUG = true; +const DEBUG = false; const { Pool } = require('pg'); const pool = new Pool({ @@ -18,7 +18,7 @@ const query = function (text, params, callback) { return pool.query(text, params, (err, res) => { const duration = Date.now() - start; //if(res) - console.log('executed query', { text, duration}) + if(DEBUG) console.log('executed query', { text, duration}) callback(err, res) }) } @@ -134,7 +134,7 @@ const insertNameKeyObject = function(req, res, next) { } else { let result = {}; result[structure['jsonName']] = rs.rows; - console.log(result); + if(DEBUG) console.log(result); res.status(200).json(result); } }); diff --git a/routes/recepie.js b/routes/recepie.js index 49f783d..d154cb5 100644 --- a/routes/recepie.js +++ b/routes/recepie.js @@ -96,7 +96,7 @@ router.get('/', function(req, res, next) { } else { let result = {}; result['recepies'] = rs.rows; - console.log(result); + if (DEBUG) console.log(result); res.status(200).json(result); } }); @@ -130,9 +130,11 @@ router.post('/', function(req, res, next) { "INSERT into rezept_schritt (rezept, sort, name, beschreibung) VALUES ($1, 1, 'Zubereitung', 'Mit Sherry ablöschen, Sahne hinzugeben und Parmesan reiben.')" ]; - console.log(querys[0],rs.rows[0].id); - console.log(querys[1],[rs.rows[0].nutzer, rs.rows[0].id]); - console.log(querys[2],rs.rows[0].id); + if (DEBUG) { + console.log(querys[0],rs.rows[0].id); + console.log(querys[1],[rs.rows[0].nutzer, rs.rows[0].id]); + console.log(querys[2],rs.rows[0].id); + } req.db.query(querys[0], [rs.rows[0].id], (err, rs) => {}); req.db.query(querys[1], [rs.rows[0].nutzer, rs.rows[0].id], (err, rs) => {}); @@ -180,12 +182,12 @@ router.copy('/:recepieId', cors(), function(req, res, next) { "INSERT into rezept_geraet (rezept, geraet, einheit, menge, beschreibung) SELECT $2, geraet, einheit, menge, beschreibung FROM rezept_geraet WHERE rezept = $1", "INSERT into rezept_schritt (rezept, sort, name, beschreibung) SELECT $2, sort, name, beschreibung FROM rezept_schritt where rezept = $1" ]; - - console.log(querys[0],recepie.id); - console.log(querys[1],recepie.id); - console.log(querys[2],recepie.id); - console.log(querys[3],recepie.id); - + if (DEBUG) { + console.log(querys[0],recepie.id); + console.log(querys[1],recepie.id); + console.log(querys[2],recepie.id); + console.log(querys[3],recepie.id); + } req.db.query(querys[0], [recepie.id, rs.rows[0].id], (err, rs) => {}); req.db.query(querys[1], [recepie.id, rs.rows[0].id], (err, rs) => {}); req.db.query(querys[2], [recepie.id, rs.rows[0].id], (err, rs) => {}); diff --git a/routes/recepieCategories.js b/routes/recepieCategories.js index a8cac0a..93686c7 100644 --- a/routes/recepieCategories.js +++ b/routes/recepieCategories.js @@ -36,7 +36,7 @@ router.get('/', function(req, res, next) { } else { let result = {}; result['recepieCategories'] = rs.rows; - console.log(result); + if (DEBUG) console.log(result); res.status(200).json(result); } }); diff --git a/routes/recepieDurations.js b/routes/recepieDurations.js index 174b2b7..c10f96c 100644 --- a/routes/recepieDurations.js +++ b/routes/recepieDurations.js @@ -33,7 +33,7 @@ router.get('/', function(req, res, next) { } else { let result = {}; result['recepieDurations'] = rs.rows; - console.log(result); + if (DEBUG) console.log(result); res.status(200).json(result); } }); diff --git a/routes/recepieIngredients.js b/routes/recepieIngredients.js index 8a04535..47651f4 100644 --- a/routes/recepieIngredients.js +++ b/routes/recepieIngredients.js @@ -40,7 +40,7 @@ router.get('/', function(req, res, next) { } else { let result = {}; result['recepieIngredients'] = rs.rows; - console.log(result); + if (DEBUG) console.log(result); res.status(200).json(result); } }); diff --git a/routes/recepieSteps.js b/routes/recepieSteps.js index c0781e6..7bc52e6 100644 --- a/routes/recepieSteps.js +++ b/routes/recepieSteps.js @@ -34,7 +34,7 @@ router.get('/', function(req, res, next) { } else { let result = {}; result['recepieSteps'] = rs.rows; - console.log(result); + if (DEBUG) console.log(result); res.status(200).json(result); } }); diff --git a/routes/recepieTools.js b/routes/recepieTools.js index 41f5a26..78e6bf2 100644 --- a/routes/recepieTools.js +++ b/routes/recepieTools.js @@ -39,7 +39,7 @@ router.get('/', function(req, res, next) { } else { let result = {}; result['recepieTools'] = rs.rows; - console.log(result); + if(DEBUG) console.log(result); res.status(200).json(result); } }); diff --git a/routes/users.js b/routes/users.js index 82e8fcb..b2851c4 100644 --- a/routes/users.js +++ b/routes/users.js @@ -31,7 +31,7 @@ router.get('/', function(req, res, next) { } else { let result = {}; result['users'] = rs.rows; - console.log(result); + if (DEBUG) console.log(result); res.status(200).json(result); } }); diff --git a/routes/valuelist.js b/routes/valuelist.js index bae2699..14462ef 100644 --- a/routes/valuelist.js +++ b/routes/valuelist.js @@ -15,7 +15,7 @@ getStructure} = require('./../db/'); router.param('id', function(req, res, next, id) { req.itemId = id; - console.log(req.body); + if (DEBUG) console.log(req.body); let structure = getStructure(req); req[structure.jsonName] = req.body; next(); @@ -33,17 +33,17 @@ router.get('/:path', function(req, res, next) { }); router.put('/:path/:id', function(req, res, next) { - console.log("Update WL"); + if (DEBUG) console.log("Update WL"); updateNameKeyObject(req, res, next) }); router.post('/:path', function(req, res, next) { - console.log("Insert WL"); + if (DEBUG) console.log("Insert WL"); insertNameKeyObject(req, res, next) }); router.delete('/:path/:id', function(req, res, next) { - console.log("Delete WL"); + if (DEBUG) console.log("Delete WL"); deleteNameKeyObject(req, res, next) });