Update dependencies and refactor server configuration: Upgrade @vue/cli and ESLint packages, replace moment.js with date-fns for date handling in eventController, and remove unused HTTPS server configuration in server.js. Additionally, streamline Vue.js build process by removing cache and thread loaders in vue.config.js.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
const { Event, Institution, EventPlace, ContactPerson, EventType } = require('../models');
|
||||
const { Op } = require('sequelize');
|
||||
const moment = require('moment'); // Import von Moment.js
|
||||
const { startOfDay } = require('date-fns');
|
||||
|
||||
const getAllEvents = async (req, res) => {
|
||||
try {
|
||||
@@ -28,7 +28,7 @@ const filterEvents = async (req, res) => {
|
||||
{
|
||||
date: {
|
||||
[Op.or]: [
|
||||
{ [Op.gte]: moment().startOf('day').toDate() },
|
||||
{ [Op.gte]: startOfDay(new Date()) },
|
||||
{ [Op.eq]: null }
|
||||
]
|
||||
}
|
||||
@@ -60,7 +60,7 @@ const filterEvents = async (req, res) => {
|
||||
const events = await Event.findAll({
|
||||
where: {
|
||||
alsoOnHomepage: 1,
|
||||
date: { [Op.gte]: moment().startOf('day').toDate() }
|
||||
date: { [Op.gte]: startOfDay(new Date()) }
|
||||
},
|
||||
include: [
|
||||
{ model: Institution, as: 'institution' },
|
||||
|
||||
9574
package-lock.json
generated
9574
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
11
package.json
11
package.json
@@ -26,13 +26,11 @@
|
||||
"@tiptap/extension-underline": "^2.4.0",
|
||||
"@tiptap/starter-kit": "^2.4.0",
|
||||
"@tiptap/vue-3": "^2.4.0",
|
||||
"@vue/cli": "^4.2.2",
|
||||
"axios": "^1.7.2",
|
||||
"bcryptjs": "^2.4.3",
|
||||
"body-parser": "^1.20.2",
|
||||
"core-js": "^3.8.3",
|
||||
"cors": "^2.8.5",
|
||||
"crypto": "^1.0.1",
|
||||
"date-fns": "^3.6.0",
|
||||
"docx": "^9.5.1",
|
||||
"dotenv": "^16.4.5",
|
||||
@@ -40,30 +38,29 @@
|
||||
"file-saver": "^2.0.5",
|
||||
"jsonwebtoken": "^9.0.2",
|
||||
"mammoth": "^1.11.0",
|
||||
"moment": "^2.30.1",
|
||||
"multer": "^1.4.5-lts.1",
|
||||
"mysql2": "^3.10.1",
|
||||
"nodemailer": "^7.0.6",
|
||||
"nodemon": "^3.1.3",
|
||||
"sequelize": "^6.37.3",
|
||||
"sequelize-cli": "^6.6.2",
|
||||
"uuid": "^10.0.0",
|
||||
"vm-browserify": "^1.1.2",
|
||||
"vue": "^3.4.30",
|
||||
"vue-multiselect": "^3.0.0",
|
||||
"vue-quill-editor": "^3.0.6",
|
||||
"vue-router": "^4.3.3",
|
||||
"vuex": "^4.0.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.12.16",
|
||||
"@babel/eslint-parser": "^7.12.16",
|
||||
"@vue/cli": "~5.0.0",
|
||||
"@vue/cli-plugin-babel": "~5.0.0",
|
||||
"@vue/cli-plugin-eslint": "~5.0.0",
|
||||
"@vue/cli-service": "~5.0.0",
|
||||
"crypto-browserify": "^3.12.0",
|
||||
"eslint": "^7.32.0",
|
||||
"eslint-plugin-vue": "^8.0.3",
|
||||
"eslint": "^8.57.0",
|
||||
"eslint-plugin-vue": "^9.23.0",
|
||||
"nodemon": "^3.1.3",
|
||||
"os-browserify": "^0.3.0",
|
||||
"path-browserify": "^1.0.1",
|
||||
"stream-browserify": "^3.0.0",
|
||||
|
||||
1
public/css/app.105a92a3.css
Normal file
1
public/css/app.105a92a3.css
Normal file
File diff suppressed because one or more lines are too long
@@ -1 +1 @@
|
||||
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>miriamgemeinde</title><script defer="defer" src="/js/chunk-vendors.a58901d9.js"></script><script defer="defer" src="/js/app.2b3ac443.js"></script><link href="/css/app.c2c4030a.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.a58901d9.js"></script><script defer="defer" src="/js/app.62331f73.js"></script><link href="/css/app.c2c4030a.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.a58901d9.js"></script><script defer="defer" src="/js/app.f7f58406.js"></script><link href="/css/app.c2c4030a.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.b7e76d39.js"></script><script defer="defer" src="/js/app.c50b5429.js"></script><link href="/css/app.3e68accd.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.b7e76d39.js"></script><script defer="defer" src="/js/app.53c460b9.js"></script><link href="/css/app.43dcf86b.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.b7e76d39.js"></script><script defer="defer" src="/js/app.e71748c3.js"></script><link href="/css/app.43dcf86b.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.2da008aa.js"></script><script defer="defer" src="/js/app.e009cb77.js"></script><link href="/css/app.674aab9c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but miriamgemeinde doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
||||
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>miriamgemeinde</title><script defer="defer" src="/js/chunk-vendors.a58901d9.js"></script><script defer="defer" src="/js/app.2b3ac443.js"></script><link href="/css/app.c2c4030a.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.a58901d9.js"></script><script defer="defer" src="/js/app.62331f73.js"></script><link href="/css/app.c2c4030a.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.a58901d9.js"></script><script defer="defer" src="/js/app.f7f58406.js"></script><link href="/css/app.c2c4030a.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.b7e76d39.js"></script><script defer="defer" src="/js/app.c50b5429.js"></script><link href="/css/app.3e68accd.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.b7e76d39.js"></script><script defer="defer" src="/js/app.53c460b9.js"></script><link href="/css/app.43dcf86b.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.b7e76d39.js"></script><script defer="defer" src="/js/app.e71748c3.js"></script><link href="/css/app.43dcf86b.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.2da008aa.js"></script><script defer="defer" src="/js/app.e009cb77.js"></script><link href="/css/app.674aab9c.css" rel="stylesheet"><script defer="defer" src="/js/chunk-vendors.2da008aa.js"></script><script defer="defer" src="/js/app.f2049431.js"></script><link href="/css/app.105a92a3.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but miriamgemeinde doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
||||
2
public/js/285.b73ad194.js
Normal file
2
public/js/285.b73ad194.js
Normal file
File diff suppressed because one or more lines are too long
1
public/js/285.b73ad194.js.map
Normal file
1
public/js/285.b73ad194.js.map
Normal file
File diff suppressed because one or more lines are too long
2
public/js/93.ab1b2f73.js
Normal file
2
public/js/93.ab1b2f73.js
Normal file
File diff suppressed because one or more lines are too long
1
public/js/93.ab1b2f73.js.map
Normal file
1
public/js/93.ab1b2f73.js.map
Normal file
File diff suppressed because one or more lines are too long
2
public/js/app.f2049431.js
Normal file
2
public/js/app.f2049431.js
Normal file
File diff suppressed because one or more lines are too long
1
public/js/app.f2049431.js.map
Normal file
1
public/js/app.f2049431.js.map
Normal file
File diff suppressed because one or more lines are too long
11
server.js
11
server.js
@@ -1,9 +1,7 @@
|
||||
const express = require('express');
|
||||
const bodyParser = require('body-parser');
|
||||
const cors = require('cors');
|
||||
const https = require('https');
|
||||
const http = require('http');
|
||||
const fs = require('fs');
|
||||
require('dotenv').config();
|
||||
|
||||
// Erhöhe maxHttpHeaderSize für Node.js (Standard ist 8KB, erhöhe auf 16KB)
|
||||
@@ -113,16 +111,7 @@ app.use('/api/image', imageRouter);
|
||||
app.use('/api/files', filesRouter);
|
||||
app.use('/api/liturgical-days', liturgicalDaysRouter);
|
||||
|
||||
const options = {
|
||||
key: fs.readFileSync('server.key'),
|
||||
cert: fs.readFileSync('server.cert'),
|
||||
|
||||
};
|
||||
|
||||
sequelize.sync().then(() => {
|
||||
/* https.createServer(options, app).listen(PORT, () => {
|
||||
console.log(`Server läuft auf Port ${PORT}`);
|
||||
});*/
|
||||
app.listen(PORT, '0.0.0.0', () => {
|
||||
console.log(`Server läuft auf Port ${PORT} (IPv4 und IPv6)`);
|
||||
});
|
||||
|
||||
@@ -45,8 +45,16 @@ module.exports = defineConfig({
|
||||
chainWebpack: config => {
|
||||
const rules = ['vue','js','ts','tsx','css','scss','sass','less','stylus'];
|
||||
rules.forEach(rule => {
|
||||
try { config.module.rule(rule).uses.delete('cache-loader'); } catch (e) {}
|
||||
try { config.module.rule(rule).uses.delete('thread-loader'); } catch (e) {}
|
||||
try {
|
||||
config.module.rule(rule).uses.delete('cache-loader');
|
||||
} catch {
|
||||
/* Regel existiert nicht in dieser Konfiguration */
|
||||
}
|
||||
try {
|
||||
config.module.rule(rule).uses.delete('thread-loader');
|
||||
} catch {
|
||||
/* s. o. */
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user