From b5a6ba76c1674183cbd93ba0b60050db7e133423 Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Mon, 25 Nov 2019 18:12:53 +0300 Subject: [PATCH] rename variables and parameters --- config/routes/routes.js | 32 +++++++++------------------ config/server.js | 16 ++++++-------- dist/public/js/bundle.js | 4 ++-- src/js/templates/items.template.js | 2 +- src/js/templates/itemsOne.template.js | 2 +- 5 files changed, 21 insertions(+), 35 deletions(-) diff --git a/config/routes/routes.js b/config/routes/routes.js index af52793..cf9ac40 100644 --- a/config/routes/routes.js +++ b/config/routes/routes.js @@ -1,9 +1,4 @@ -const db = require('../database'); -const dbName = db.name; - -function indexRoute(req, res, db) { - const dbo = db.db(dbName); - +function indexRoute(req, res, dbo) { dbo.collection('storeInfo').find().toArray((err, result) => { if (err) throw err; const array = Object.keys(result[0].items) @@ -17,12 +12,7 @@ function indexRoute(req, res, db) { }) } -function getItemsRoute(req, res, db) { - const dbo = db.db(dbName); - - // установка кэша при отдачи json данных - //res.setHeader("Cache-Control", "public, max-age=20"); - +function getItemsRoute(req, res, dbo) { if (req.query.auth === 'yYNfW8ynVO18L1TW5qIkILM1WtWgrVZz') { if (req.query.option === 'all' && !req.query.sorting) { dbo.collection('storeInfo').find().toArray((err, result) => { @@ -48,14 +38,14 @@ function getItemsRoute(req, res, db) { dbo.collection('storeInfo').find().toArray((err, result) => { if (err) throw err; const items = result[0].items[req.query.category]; - items.sort((a, b) => new Date(a.date) - new Date(b.date)); // фильтр по возрастанию пр дате + items.sort((a, b) => new Date(a.date) - new Date(b.date)); // фильтр по возрастанию по дате res.send(items); }); } else if (!req.query.option && req.query.category && req.query.sorting === 'newer') { dbo.collection('storeInfo').find().toArray((err, result) => { if (err) throw err; const items = result[0].items[req.query.category]; - items.sort((a, b) => new Date(b.date) - new Date(a.date)) // фильтр по возрастанию пр дате + items.sort((a, b) => new Date(b.date) - new Date(a.date)) // фильтр по убыванию по дате res.send(items); }); } else if (!req.query.option && req.query.category) { @@ -104,9 +94,7 @@ function getItemsRoute(req, res, db) { } } -function onePageItemRoute(req, res, db) { - const dbo = db.db(dbName); - +function onePageItemRoute(req, res, dbo) { dbo.collection('storeInfo').find().toArray((err, result) => { if (err) throw err; const items = result[0].items; @@ -134,25 +122,25 @@ function onePageItemRoute(req, res, db) { }) } -function howToBuyRoute(req, res, db) { +function howToBuyRoute(req, res) { res.render('how-to-buy', { pageName: 'how-to-buy' }); } -function contactsRoute(req, res, db) { +function contactsRoute(req, res) { res.render('contacts', { pageName: 'contacts' }); } -function commentsRoute(req, res, db) { +function commentsRoute(req, res) { res.render('comments', { pageName: 'comments' }); } -function myOrdersRoute(req, res, db) { +function myOrdersRoute(req, res) { res.render('my-orders', { pageName: 'my-orders' }); @@ -161,10 +149,10 @@ function myOrdersRoute(req, res, db) { module.exports = function (server, db) { server.get('/', (req, res) => indexRoute(req, res, db)); + server.get('/store-api', (req, res) => getItemsRoute(req, res, db)); server.get('/how-to-buy', (req, res) => howToBuyRoute(req, res, db)); server.get('/contacts', (req, res) => contactsRoute(req, res, db)); server.get('/comments', (req, res) => commentsRoute(req, res, db)); server.get('/my-orders', (req, res) => myOrdersRoute(req, res, db)); server.get('/product/:id', (req, res) => onePageItemRoute(req, res, db)); - server.get('/store-api', (req, res) => getItemsRoute(req, res, db)); } diff --git a/config/server.js b/config/server.js index 854e6d8..1d5e36e 100644 --- a/config/server.js +++ b/config/server.js @@ -1,23 +1,21 @@ const MongoClient = require('mongodb').MongoClient; -const db = require('./database'); +const db_config = require('./database'); const express = require('express'); const server = express(); const path = require('path'); - - - - -MongoClient.connect(db.url, {useNewUrlParser: true, useUnifiedTopology: true}, (err, database) => { +MongoClient.connect(db_config.url, {useNewUrlParser: true, useUnifiedTopology: true}, (err, client) => { if (err) return console.log(err) + const db = client.db(db_config.name); - // Pug config + // Config server.use(express.static(path.join(__dirname, '../dist/public'))); - // server.use('/css', express.static(__dirname + '../dist/public/css')); server.set('view engine', 'pug'); server.set('views', path.join(__dirname, '../dist/views')); - require('./routes/routes')(server, database); + // Routes + require('./routes/routes')(server, db); + // 404 Redirect server.use((req, res) => res.status(404).send('Error 404')); server.listen(3000, () => console.log('Listen port 3000...')); diff --git a/dist/public/js/bundle.js b/dist/public/js/bundle.js index c651713..859c534 100644 --- a/dist/public/js/bundle.js +++ b/dist/public/js/bundle.js @@ -4050,7 +4050,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) * /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"renderItems\", function() { return renderItems; });\nfunction renderItems(categories, items) {\n var html = '';\n categories.forEach(function (category) {\n html += \"
\\n

\".concat(category, \"

\\n
\");\n items[category].forEach(function (item) {\n if (item) {\n html += \"\\n
\\n
\\n
\\n \\\"#\\\"\\n
\\n
\\n \").concat(item.title, \"\\n
\\n
\\n
\\n
\\n \").concat(item.date, \"\\n
\\n
\\n \").concat(item.count, \" \\u0448\\u0442.\\n
\\n
\\n \\u0426\\u0435\\u043D\\u0430 \\u0437\\u0430 1 \\u0448\\u0442.\\n
\\n
\\n \").concat(item.price.toFixed(2), \"\\u20BD\\n
\\n
\\n \\n \\n
\\n
\\n
\\n \");\n } else {\n html += \"\\n
\\n
\\n
\\n \\u0412 \\u044D\\u0442\\u043E\\u0439 \\u043A\\u0430\\u0442\\u0435\\u0433\\u043E\\u0440\\u0438\\u0438 \\u043F\\u043E\\u043A\\u0430 \\u0447\\u0442\\u043E \\u043D\\u0435\\u0442\\u0443 \\u0442\\u043E\\u0432\\u0430\\u0440\\u043E\\u0432\\n
\\n
\\n
\\n \";\n }\n });\n });\n return html;\n}\n\n//# sourceURL=webpack:///./src/js/templates/items.template.js?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"renderItems\", function() { return renderItems; });\nfunction renderItems(categories, items) {\n var html = '';\n categories.forEach(function (category) {\n html += \"
\\n

\".concat(category, \"

\\n
\");\n items[category].forEach(function (item) {\n if (item && item._id != undefined) {\n html += \"\\n
\\n
\\n
\\n \\\"#\\\"\\n
\\n
\\n \").concat(item.title, \"\\n
\\n
\\n
\\n
\\n \").concat(item.date, \"\\n
\\n
\\n \").concat(item.count, \" \\u0448\\u0442.\\n
\\n
\\n \\u0426\\u0435\\u043D\\u0430 \\u0437\\u0430 1 \\u0448\\u0442.\\n
\\n
\\n \").concat(item.price.toFixed(2), \"\\u20BD\\n
\\n
\\n \\n \\n
\\n
\\n
\\n \");\n } else {\n html += \"\\n
\\n
\\n
\\n \\u0412 \\u044D\\u0442\\u043E\\u0439 \\u043A\\u0430\\u0442\\u0435\\u0433\\u043E\\u0440\\u0438\\u0438 \\u043F\\u043E\\u043A\\u0430 \\u0447\\u0442\\u043E \\u043D\\u0435\\u0442\\u0443 \\u0442\\u043E\\u0432\\u0430\\u0440\\u043E\\u0432\\n
\\n
\\n
\\n \";\n }\n });\n });\n return html;\n}\n\n//# sourceURL=webpack:///./src/js/templates/items.template.js?"); /***/ }), @@ -4062,7 +4062,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) * /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"renderItemsOne\", function() { return renderItemsOne; });\nfunction renderItemsOne(category, items) {\n var html = '';\n html += \"
\\n

\".concat(category, \"

\\n
\");\n items.forEach(function (item) {\n if (item) {\n html += \"\\n
\\n
\\n
\\n \\\"#\\\"\\n
\\n
\\n \").concat(item.title, \"\\n
\\n
\\n
\\n
\\n \").concat(item.date, \"\\n
\\n
\\n \").concat(item.count, \" \\u0448\\u0442.\\n
\\n
\\n \\u0426\\u0435\\u043D\\u0430 \\u0437\\u0430 1 \\u0448\\u0442.\\n
\\n
\\n \").concat(item.price.toFixed(2), \"\\u20BD\\n
\\n
\\n \\n \\n
\\n
\\n
\\n \");\n } else {\n html += \"\\n
\\n
\\n
\\n \\u0412 \\u044D\\u0442\\u043E\\u0439 \\u043A\\u0430\\u0442\\u0435\\u0433\\u043E\\u0440\\u0438\\u0438 \\u043F\\u043E\\u043A\\u0430 \\u0447\\u0442\\u043E \\u043D\\u0435\\u0442\\u0443 \\u0442\\u043E\\u0432\\u0430\\u0440\\u043E\\u0432\\n
\\n
\\n
\";\n }\n });\n return html;\n}\n\n//# sourceURL=webpack:///./src/js/templates/itemsOne.template.js?"); +eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"renderItemsOne\", function() { return renderItemsOne; });\nfunction renderItemsOne(category, items) {\n var html = '';\n html += \"
\\n

\".concat(category, \"

\\n
\");\n items.forEach(function (item) {\n if (item && item._id != undefined) {\n html += \"\\n
\\n
\\n
\\n \\\"#\\\"\\n
\\n
\\n \").concat(item.title, \"\\n
\\n
\\n
\\n
\\n \").concat(item.date, \"\\n
\\n
\\n \").concat(item.count, \" \\u0448\\u0442.\\n
\\n
\\n \\u0426\\u0435\\u043D\\u0430 \\u0437\\u0430 1 \\u0448\\u0442.\\n
\\n
\\n \").concat(item.price.toFixed(2), \"\\u20BD\\n
\\n
\\n \\n \\n
\\n
\\n
\\n \");\n } else {\n html += \"\\n
\\n
\\n
\\n \\u0412 \\u044D\\u0442\\u043E\\u0439 \\u043A\\u0430\\u0442\\u0435\\u0433\\u043E\\u0440\\u0438\\u0438 \\u043F\\u043E\\u043A\\u0430 \\u0447\\u0442\\u043E \\u043D\\u0435\\u0442\\u0443 \\u0442\\u043E\\u0432\\u0430\\u0440\\u043E\\u0432\\n
\\n
\\n
\";\n }\n });\n return html;\n}\n\n//# sourceURL=webpack:///./src/js/templates/itemsOne.template.js?"); /***/ }), diff --git a/src/js/templates/items.template.js b/src/js/templates/items.template.js index eb3430f..4fe59fe 100644 --- a/src/js/templates/items.template.js +++ b/src/js/templates/items.template.js @@ -7,7 +7,7 @@ export function renderItems(categories, items) {

${category}

`; items[category].forEach(item => { - if (item) { + if (item && item._id != undefined) { html += `
diff --git a/src/js/templates/itemsOne.template.js b/src/js/templates/itemsOne.template.js index 1ddd9d9..c67e18c 100644 --- a/src/js/templates/itemsOne.template.js +++ b/src/js/templates/itemsOne.template.js @@ -6,7 +6,7 @@ export function renderItemsOne(category, items) {
`; items.forEach(item => { - if (item) { + if (item && item._id != undefined) { html += `