From 63346de8c1349483bf5b2527db262e322502a270 Mon Sep 17 00:00:00 2001 From: Nikola Petrov Date: Wed, 4 Oct 2023 20:19:16 +0200 Subject: [PATCH] Format --- controllers/cashTransactionController.js | 48 ++++++++++++------------ controllers/gameController.js | 2 - middleware/checkAuthenticated.js | 4 +- package.json | 2 +- routes/api/apiRouter.js | 2 +- routes/api/gameRouter.js | 4 +- routes/main.js | 2 +- routes/user.js | 2 +- views/cash.hbs | 2 +- views/layout.hbs | 36 ++++++++++-------- views/list.hbs | 3 +- views/user.hbs | 12 +++--- 12 files changed, 61 insertions(+), 58 deletions(-) diff --git a/controllers/cashTransactionController.js b/controllers/cashTransactionController.js index aa6891b..89360a8 100644 --- a/controllers/cashTransactionController.js +++ b/controllers/cashTransactionController.js @@ -2,20 +2,18 @@ var cashTransactionModel = require('../models/cashTransactionModel.js'); module.exports = { list: async function (req, res) { - - try{ - + try { const transactions = await cashTransactionModel.find() const data = { messages: transactions }; return res.render('cash', data); - }catch (err) { - return res.status(500).json({ - message: 'Error when getting transactions.', - error: err - }); - }; + } catch (err) { + return res.status(500).json({ + message: 'Error when getting transactions.', + error: err + }); + }; }, create: async function (req, res) { @@ -35,20 +33,20 @@ module.exports = { const amountPattern = /\d{1,3}(?:[.]\d{3})*(?:[.,]\d{2})(?=\sEUR)/; const companyPattern1 = /(?<=(UR,|\sod)\s).*?(?=\s(na\s|za\s|Inf))/; - if (rawString.includes("ZAVRNITEV POS NAKUP")) transaction.type = 2; - else if (rawString.includes("POS NAKUP")) transaction.type = 1; - else if (rawString.includes("BA DVIG")) transaction.type = 3; - else if (rawString.includes("priliv")) transaction.type = 4; - else if (rawString.includes("SDD")) transaction.type = 5; - else if (rawString.includes("SPLET/TEL NAKUP")) transaction.type = 6; + if (rawString.includes("ZAVRNITEV POS NAKUP")) transaction.type = 2; + else if (rawString.includes("POS NAKUP")) transaction.type = 1; + else if (rawString.includes("BA DVIG")) transaction.type = 3; + else if (rawString.includes("priliv")) transaction.type = 4; + else if (rawString.includes("SDD")) transaction.type = 5; + else if (rawString.includes("SPLET/TEL NAKUP")) transaction.type = 6; else if (rawString.includes("PREDAVTORIZACIJE")) transaction.type = 7; - if(transaction.type != 0){ + if (transaction.type != 0) { const amountMatch = rawString.match(amountPattern); - if (amountMatch){ + if (amountMatch) { const amount = amountMatch[0].replace('.', '').replace(',', '.'); - transaction.amount = parseFloat( amount); - } + transaction.amount = parseFloat(amount); + } const companyMatch1 = rawString.match(companyPattern1); if (companyMatch1) transaction.company = companyMatch1[0]; @@ -62,18 +60,18 @@ module.exports = { } } const trans = await transaction.save() - if(trans){ + if (trans) { return res.status(201).json(trans); } - else{ - return res.status(400).json({message: "something went wrong"}); + else { + return res.status(400).json({ message: "something went wrong" }); } }, delete: async function (req, res) { cashTransactionModel.deleteMany({}) - .then(data =>{ - res.status(201).json({message:"OK"}); - }); + .then(data => { + res.status(201).json({ message: "OK" }); + }); }, }; \ No newline at end of file diff --git a/controllers/gameController.js b/controllers/gameController.js index 50bb088..a4075a7 100644 --- a/controllers/gameController.js +++ b/controllers/gameController.js @@ -16,8 +16,6 @@ module.exports = { }); }, - - create: async function (req, res) { var gameCode = req.body.code; const userFound = req.user; diff --git a/middleware/checkAuthenticated.js b/middleware/checkAuthenticated.js index e86c905..af6aa53 100644 --- a/middleware/checkAuthenticated.js +++ b/middleware/checkAuthenticated.js @@ -2,7 +2,7 @@ var UserModel = require('../models/userModel'); async function checkAuthenticated(req, res, next) { - try{ + try { const password = req.body.pass; const userFound = await UserModel.findOne({ pass: password }); if (!userFound) { @@ -10,7 +10,7 @@ async function checkAuthenticated(req, res, next) { } req.user = userFound; return next(); - }catch (err) { + } catch (err) { console.log(err); return res.status(500).json({ message: 'Error when getting transactions.' }); } diff --git a/package.json b/package.json index 367011a..2de251b 100644 --- a/package.json +++ b/package.json @@ -14,4 +14,4 @@ "morgan": "~1.9.1", "multer": "^1.4.5-lts.1" } -} +} \ No newline at end of file diff --git a/routes/api/apiRouter.js b/routes/api/apiRouter.js index f13f7b2..9e6bc91 100644 --- a/routes/api/apiRouter.js +++ b/routes/api/apiRouter.js @@ -14,7 +14,7 @@ router.use('/series', mediaRouter); router.use('/cash', checkAuthenticated, cashTransactionRouter); router.get('/', function (req, res, next) { - res.status(200).json({message: 'API is working'}); + res.status(200).json({ message: 'API is working' }); }); module.exports = router; \ No newline at end of file diff --git a/routes/api/gameRouter.js b/routes/api/gameRouter.js index c8b72d4..0665ad4 100644 --- a/routes/api/gameRouter.js +++ b/routes/api/gameRouter.js @@ -5,8 +5,8 @@ var checkAuthenticated = require('../../middleware/checkAuthenticated.js'); router.get('/', gameController.list); -router.post('/',checkAuthenticated, gameController.create); +router.post('/', checkAuthenticated, gameController.create); -router.delete('/',checkAuthenticated, gameController.remove); +router.delete('/', checkAuthenticated, gameController.remove); module.exports = router; \ No newline at end of file diff --git a/routes/main.js b/routes/main.js index 9eade70..cd23c79 100644 --- a/routes/main.js +++ b/routes/main.js @@ -15,7 +15,7 @@ router.get('/mail', function (req, res, next) { }); router.get('/list', function (req, res, next) { - res.render('list', {title: 'List'}); + res.render('list', { title: 'List' }); }); const userRouter = require('./user'); diff --git a/routes/user.js b/routes/user.js index e9c3b95..16f6570 100644 --- a/routes/user.js +++ b/routes/user.js @@ -5,7 +5,7 @@ const checkAuthenticated = require('../middleware/checkAuthenticated.js'); /* GET home page. */ router.get('/', function (req, res, next) { - res.render('user', {title: 'Register'}); + res.render('user', { title: 'Register' }); }); router.post('/', userController.create); diff --git a/views/cash.hbs b/views/cash.hbs index d646444..00135c2 100644 --- a/views/cash.hbs +++ b/views/cash.hbs @@ -27,6 +27,6 @@ {{raw}} {{/each}} - + \ No newline at end of file diff --git a/views/layout.hbs b/views/layout.hbs index d5805b6..238c628 100644 --- a/views/layout.hbs +++ b/views/layout.hbs @@ -1,17 +1,23 @@ - - - - - - {{#unless disableBootStrap}} - - - {{/unless}} - {{title}} - - - {{{body}}} - - + + + + + + + {{#unless disableBootStrap}} + + + {{/unless}} + {{title}} + + + + {{{body}}} + + + \ No newline at end of file diff --git a/views/list.hbs b/views/list.hbs index 659a6fd..3016fcd 100644 --- a/views/list.hbs +++ b/views/list.hbs @@ -19,7 +19,8 @@
  • -