Browse Source

merge

pull/6/head
root 12 months ago
parent
commit
4082cd089c
  1. 14175
      package-lock.json
  2. 16
      package.json
  3. 2
      src/app.js
  4. 2
      src/services/file.js

14175
package-lock.json

File diff suppressed because it is too large

16
package.json

@ -11,17 +11,17 @@
},
"dependencies": {
"bootstrap": "^5.3.2",
"cookie-parser": "~1.4.4",
"cookie-parser": "^1.4.6",
"csv-parser": "^3.0.0",
"debug": "~2.6.9",
"ejs": "~2.6.1",
"debug": "^4.3.4",
"ejs": "^3.1.9",
"events": "^3.3.0",
"express": "~4.16.1",
"express-handlebars": "^7.1.2",
"express": "^4.18.2",
"express-handlebars": "^6.0.7",
"handlebars": "^4.7.8",
"http-errors": "~1.6.3",
"http-errors": "^2.0.0",
"jquery": "^3.7.1",
"morgan": "~1.9.1",
"morgan": "^1.10.0",
"popper.js": "^1.16.1",
"slugify": "^1.6.6",
"socket.io": "^4.7.2",
@ -37,7 +37,7 @@
"css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^5.0.1",
"mini-css-extract-plugin": "^2.7.6",
"node-sass": "^9.0.0",
"node-sass": "^4.9.4",
"nodemon": "^3.0.1",
"sass-loader": "^13.3.2",
"webpack": "^5.88.2",

2
src/app.js

@ -41,7 +41,7 @@ app.use(function(err, req, res, next) {
// render the error page
res.status(err.status || 500);
res.render('error');
res.send('error');
});
module.exports = app;

2
src/services/file.js

@ -1,7 +1,7 @@
const csv = require('csv-parser');
const fs = require('fs');
const path = require('path');
const File = require('../models/file');
const File = require('../models/file.js');
const emitter = require('./eventEmitter');
const { basedir } = require('../config/constants');
const { emit } = require('process');

Loading…
Cancel
Save