nikola/personal_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format

Browse Source
This commit is contained in:
Nikola Petrov 2023-10-04 20:19:16 +02:00
parent ea623cedc8
commit 63346de8c1
12 changed files with 61 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
controllers/cashTransactionController.js
View File

@ -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" });
});
},
};

2
controllers/gameController.js
View File

@ -16,8 +16,6 @@ module.exports = {
});
},
create: async function (req, res) {
var gameCode = req.body.code;
const userFound = req.user;

4
middleware/checkAuthenticated.js
View File

@ -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.' });
}

2
package.json
View File

@ -14,4 +14,4 @@
"morgan": "~1.9.1",
"multer": "^1.4.5-lts.1"
}
}
}

2
routes/api/apiRouter.js
View File

@ -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;

4
routes/api/gameRouter.js
View File

@ -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;

2
routes/main.js
View File

@ -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');

2
routes/user.js
View File

@ -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);

2
views/cash.hbs
View File

@ -27,6 +27,6 @@
<td>{{raw}}</td>
</tr>
{{/each}}
</tbody>
</table>

36
views/layout.hbs
View File

@ -1,17 +1,23 @@
<!doctype html>
<html lang="en" data-bs-theme="dark">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
{{#unless disableBootStrap}}
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
{{/unless}}
<title>{{title}}</title>
</head>
<body>
{{{body}}}
</body>
</html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="images/logo.ico" type="image/x-icon">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
{{#unless disableBootStrap}}
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
crossorigin="anonymous"></script>
{{/unless}}
<title>{{title}}</title>
</head>
<body>
{{{body}}}
</body>
</html>

3
views/list.hbs
View File

@ -19,7 +19,8 @@
<button class="nav-link" id="gameButton">Games</button>
</li>
<li class="nav-item dropdown">
<button class="nav-link dropdown-toggle" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
<button class="nav-link dropdown-toggle" id="navbarDropdown" role="button" data-bs-toggle="dropdown"
aria-expanded="false">
Sort
</button>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">

12
views/user.hbs
View File

@ -25,30 +25,30 @@
<div class="btn btn-primary" id="get"> Get</div>
<br>
<div id="text"></div>
<script>
async function deleteUser(){
async function deleteUser() {
const password = document.getElementById('password').value;
const response = await fetch('/user', {
method: 'DELETE',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({"password": password}),
body: JSON.stringify({ "password": password }),
})
const data = await response.json();
document.getElementById('text').innerHTML = data.message;
document.getElementById('text').innerHTML = data.message;
}
async function getUser(){
async function getUser() {
const password = document.getElementById('password').value;
const response = await fetch('/user', {
method: 'PUT',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({"password": password}),
body: JSON.stringify({ "password": password }),
})
const data = await response.json();
console.log(data);