added markdown

dist/views/main/contacts.pug

@@ -19,7 +19,7 @@ main.main-section
               p
                 strong Контакты
               p  
-              p(style="white-space: pre-wrap;") #{store.contacts}
+              != store.contacts
 
 
 //- Footer Template

dist/views/main/how-to-buy.pug

@@ -19,7 +19,7 @@ main.main-section
               p
                 strong Для того, чтобы купить аккаунты в магазине, нужно проделать следующие шаги:
               p  
-              p(style="white-space: pre-wrap;")  #{store.howToBuy}
+              != store.howToBuy
 
 
 //- Footer Template

dist/views/main/index.pug

@@ -16,7 +16,7 @@ main.main-section
             .information-title
               h2.small-title Важная информация:
             .information-text
-              p(style="white-space: pre-wrap;") #{store.info}
+              != store.info
             .information-close
               button#information-close.waves-effect.btn.red Закрыть
       // Information Block END
@@ -95,7 +95,7 @@ main.main-section
                 .items-info__title.block-title
                   i.material-icons info
                   h3.med-title Информация
-                p(style="white-space: pre-wrap;") #{store.infoBottom}
+                != store.infoBottom
       // Items Block END
 
 //- Footer Template

dist/views/main/product.pug

@@ -39,15 +39,15 @@ main.main-section
                 .product-right__title
                   span Описание:
                   hr
-                  p #{description}
+                  != description
                 .product-right__content
                   h2 Тип аккаунтов  #{category}
-                  p #{type}
+                  != type
                   h2 Формат аккаунтов #{category}
-                  p #{format}
+                  != format
                   hr
                   h3 Рекомендации к покупке аккаунтов.
-                  p #{store.recommendations}
+                  != store.recommendations
                       
                   h3 Отзывы о товаре
                 #disqus_thread

package.json

@@ -27,6 +27,7 @@
     "express-flash": "0.0.2",
     "express-session": "^1.17.0",
     "log4js": "^6.1.0",
+    "marked": "^1.1.0",
     "method-override": "^3.0.0",
     "mongodb": "^3.3.4",
     "multer": "^1.4.2",

server/routes/main.js

@@ -1,162 +1,178 @@
-const ObjectID = require('mongodb').ObjectID;
+const ObjectID = require('mongodb').ObjectID
-const nodemailer = require('../config/nodemailer.config');
+const marked = require('marked')
+const nodemailer = require('../config/nodemailer.config')
 
 module.exports = function (server, db) {
   server.get('/', async (req, res) => {
     try {
-            const store = await db.collection('content').findOne({});
+      const store = await db.collection('content').findOne({})
-            db.collection('categories').find().toArray((err, result) => {
+      db.collection('categories')
-                const categories = result.map(category => category.title[0].toUpperCase() + category.title.slice(1));
+        .find()
+        .toArray((err, result) => {
+          const categories = result.map(
+            (category) =>
+              category.title[0].toUpperCase() + category.title.slice(1)
+          )
           res.render('main/index', {
             pageName: 'index',
             title: `${store.title} | Главная`,
             categories,
             store: {
               title: store.title,
-                        info: store.info,
+              info: marked(store.info),
-                        infoBottom: store.infoBottom,
+              infoBottom: marked(store.infoBottom),
-                        color: store.color
+              color: store.color,
-                    }
+            },
-                });
+          })
-            });
+        })
     } catch {
-            res.status(500).render('main/404');
+      res.status(500).render('main/404')
     }
-    });
+  })
   server.get('/how-to-buy', async (req, res) => {
     try {
-            const store = await db.collection('content').findOne({});
+      const store = await db.collection('content').findOne({})
       res.render('main/how-to-buy', {
         pageName: 'how-to-buy',
         title: `${store.title} | Как купить товар`,
         store: {
           title: store.title,
-                    howToBuy: store.howToBuy,
+          howToBuy: marked(store.howToBuy),
-                    color: store.color
+          color: store.color,
-                }
+        },
-            });
+      })
     } catch {
-            res.status(500).render('main/404');
+      res.status(500).render('main/404')
     }
-    });
+  })
   server.get('/contacts', async (req, res) => {
     try {
-            const store = await db.collection('content').findOne({});
+      const store = await db.collection('content').findOne({})
       res.render('main/contacts', {
         pageName: 'contacts',
         title: `${store.title} | Контакты`,
         store: {
           title: store.title,
-                    contacts: store.contacts,
+          contacts: marked(store.contacts),
-                    color: store.color
+          color: store.color,
-                }
+        },
-            });
+      })
     } catch {
-            res.status(500).render('main/404');
+      res.status(500).render('main/404')
     }
-    });
+  })
   server.get('/comments', async (req, res) => {
     try {
-            const store = await db.collection('content').findOne({});
+      const store = await db.collection('content').findOne({})
       res.render('main/comments', {
         pageName: 'comments',
         title: `${store.title} | Отзывы`,
         store: {
           title: store.title,
-                    color: store.color
+          color: store.color,
-                }
+        },
-            });
+      })
     } catch {
-            res.status(500).render('main/404');
+      res.status(500).render('main/404')
     }
-    });
+  })
   server.get('/my-orders', async (req, res) => {
     try {
-            const store = await db.collection('content').findOne({});
+      const store = await db.collection('content').findOne({})
       res.render('main/my-orders', {
         pageName: 'my-orders',
         title: `${store.title} | Мои покупки`,
         store: {
           title: store.title,
-                    color: store.color
+          color: store.color,
-                }
+        },
-            });
-        } catch {
-            res.status(500).render('main/404');
-        }
-    });
-    server.get('/product/:id', async (req, res) => {
-        const store = await db.collection('content').findOne({});
-        const product = new Promise((resolve, reject) => {
-            db.collection('items').find({_id: ObjectID(req.params.id)}).toArray()
-                .then((items) => {
-                    const item = items.find(item => item);
-                    resolve(item);
-                });
-        });
-
-        product.then((item) => {
-            return new Promise((resolve, reject) => {
-                db.collection('categories').find({title: item.category}).toArray()
-                    .then((categories) => {
-                        const category = categories.find(category => category);
-                        resolve({item, category});
-                    });
-            });
       })
-        .then(((data) => {
+    } catch {
+      res.status(500).render('main/404')
+    }
+  })
+  server.get('/product/:id', async (req, res) => {
+    const store = await db.collection('content').findOne({})
+    const product = new Promise((resolve, reject) => {
+      db.collection('items')
+        .find({ _id: ObjectID(req.params.id) })
+        .toArray()
+        .then((items) => {
+          const item = items.find((item) => item)
+          resolve(item)
+        })
+    })
+
+    product
+      .then((item) => {
+        return new Promise((resolve, reject) => {
+          db.collection('categories')
+            .find({ title: item.category })
+            .toArray()
+            .then((categories) => {
+              const category = categories.find((category) => category)
+              resolve({ item, category })
+            })
+        })
+      })
+      .then((data) => {
         const item = data.item,
-                category = data.category;
+          category = data.category
         res.render('main/product', {
           title: item.title,
           image: category.img,
           count: item.count,
           category: item.category[0].toUpperCase() + item.category.slice(1),
           price: item.price,
-                description: item.description,
+          description: marked(item.description),
           date: item.date,
           id: item._id,
-                type: category.type,
+          type: marked(category.type),
-                format: category.format,
+          format: marked(category.format),
           store: {
             title: store.title,
-                    recommendations: store.recommendations,
+            recommendations: marked(store.recommendations),
-                    color: store.color
+            color: store.color,
-                }
+          },
-            });
+        })
-        }))
+      })
       .catch(() => {
-            res.status(500).render('main/404');
+        res.status(500).render('main/404')
-        });
+      })
-    });
+  })
   server.post('/my-orders', async (req, res) => {
-        const buyers = await db.collection('buyers').find({email: req.body.email}).toArray();
+    const buyers = await db
+      .collection('buyers')
+      .find({ email: req.body.email })
+      .toArray()
     if (buyers.length > 0) {
       // рендерим html
       const html = buyers.map((buyer) => {
         return `
                     <b>Номер заказа: ${buyer.bill_id}</b><br>
-                    <b>Дата оплаты: ${new Date(buyer.date).toLocaleDateString()}</b><br>
+                    <b>Дата оплаты: ${new Date(
+                      buyer.date
+                    ).toLocaleDateString()}</b><br>
                     <b>Данные товара:</b><br>
                     <p>${buyer.data.join('<br>')}</p>
                     <p>======================================================================</p>
-                `;
+                `
-            });
+      })
 
       // высылаем данные покупателю
       try {
         await nodemailer.transporter.sendMail({
           from: `"Ваши покупки." <${process.env.EMAIL_LOGIN}>`,
           to: req.body.email,
-                    subject: "Данные купленных товаров находятся в этом письме.",
+          subject: 'Данные купленных товаров находятся в этом письме.',
-                    html: html.join('')
+          html: html.join(''),
-                });
+        })
-                res.json({status: 'OK'});
+        res.json({ status: 'OK' })
       } catch (error) {
-                res.json({status: 'ERR'});
+        res.json({ status: 'ERR' })
       }
     } else {
-            res.json({status: 'NF'});
+      res.json({ status: 'NF' })
     }
-    });
+  })
 }