complete version update

This reverts commit 688b0616cc.

.gitignore

@@ -24,5 +24,9 @@ node_modules
 *.synctex.gz
 *.fdb_latexmk
 ._wordcount_selection.tex
+/*.zip
 
-AppMarketing
+AppMarketing
+
+yarn.lock
+package-lock.json

README.md

@@ -47,10 +47,15 @@ Alternatively, you may download the project directly from GitHub (by cloning it
 There are a few features planned for libreevent. Please discuss other ideas in the issue I opened specifically for this. (see #12)
 
 # Contributing
-If you want to contribute to this project, please read more [here](https://libreevent.janishutz.com/docs/contributing). Until the end of October 2023, no contributions can be accepted into master. 
+If you want to contribute to this project, please read more [here](https://libreevent.janishutz.com/docs/contributing).
 
 # Supporting the project
 If you like this project and it helped you save money, please consider donating to help fund the continuous development. If you are a company, please contact me [here](https://libreevent.janishutz.com/docs/sponsoring) if you want to sponsor the project and become an official partner.
+<div id="donate" align="center">
+    <a href="https://store.janishutz.com/donate">
+        <img src="https://store-cdn.janishutz.com/static/support-me.jpg" width="150px">
+    </a>
+</div>
 
 # Repository structure
 - [assets/](/assets/): contains the logo (as png and GIMP file), also iOS and Android marketing materials, just global assets (images / videos)
@@ -72,5 +77,7 @@ You may notice some additional folders appearing after running
 This is to shrink the repository size. Distribution ready files can be found in the releases or on our [website](https://libreevent.janishutz.com/download).
 
 <div id="donate" align="center">
-    <img src="https://store-cdn.janishutz.com/static/support-me.jpg" width="150px">
+    <a href="https://store.janishutz.com/donate">
+        <img src="https://store-cdn.janishutz.com/static/support-me.jpg" width="150px">
+    </a>
 </div>

package-lock.json

@@ -1,13 +0,0 @@
-{
-  "name": "libreevent",
-  "version": "1.0.1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "libreevent",
-      "version": "1.0.1",
-      "license": "GPL-3.0-or-later"
-    }
-  }
-}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreevent",
-  "version": "1.0.7",
+  "version": "1.1.5",
   "description": "A free and open source event management solution",
   "main": "/dist/app.js",
   "scripts": {

package.sh

@@ -6,7 +6,7 @@
 #
 #
 
-v="V1.0.7"
+v="V1.1.5"
 
 echo "
  _ _ _                                   _   
@@ -36,7 +36,7 @@ sleep 0.5
 
 cd src/webapp/setup
 npm i
-npm audit fix
+npm audit fix --force
 
 sleep 1
 
@@ -54,7 +54,7 @@ cd ../main
 
 
 npm i
-npm audit fix
+npm audit fix --force
 
 sleep 1
 
@@ -115,11 +115,11 @@ echo "
 sleep 1
 
 cd ..
-zip -9r libreevent-$v-prebuilt.zip dist
+zip -9r libreevent-$v-custom.zip dist
 
 echo " 
 
-==> Created prebuilt archive <==
+==> Created custom archive <==
 ==> Creating archive for node_modules <==
 
 "
@@ -129,7 +129,7 @@ sleep 1
 cd src/server
 npm i
 
-npm audit fix
+npm audit fix --force
 
 sleep 1
 
@@ -154,8 +154,22 @@ zip -9r libreevent-$v-full-icu.zip src/server/package.json src/server/package-lo
 cd src/server
 npm uninstall full-icu
 
-cd ../../
+echo " 
-rm -rf dist
+
+==> Archived full-icu config <==
+==> Creating archive for prebuilt install <==
+
+"
+
+cd ../../dist
+cp ../README.md .
+
+cd ..
+rm -rf ./simple/node_modules
+rm ./simple/package-lock.json
+rm ./simple/yarn.lock
+
+zip -9r libreevent-$v-prebuilt.zip simple
 
 echo " 
 
@@ -177,5 +191,7 @@ echo "
     Next steps: 
         - Check that everything was packaged correctly
         - Create a release on GitHub
+        - Run 'cd dist && npm publish'
+        - Delete all newly spawned files
 
 "

simple/app.js

@@ -0,0 +1,16 @@
+/*
+*				libreevent - index.js
+*
+*	Created by Janis Hutz 08/26/2024, Licensed under the GPL V3 License
+*			https://janishutz.com, development@janishutz.com
+*
+*
+*/
+
+/*
+    This file is a wrapper for the npm package
+*/
+
+const libreevent = require( 'libreevent' );
+
+libreevent.run( __dirname );

simple/config/db.config.json

@@ -0,0 +1,7 @@
+{
+    "host": "",
+    "database": "",
+    "user": "",
+    "password": "",
+    "port": 3306
+}

simple/config/mail.config.json

@@ -0,0 +1,12 @@
+{
+    "host":"",
+    "port": 587,
+    "secure": false,
+    "auth": {
+        "user":"",
+        "pass":""
+    },
+    "tls": {
+    	"servername": ""
+    }
+}

simple/config/settings.config.json

@@ -0,0 +1,17 @@
+{
+	"init":false,
+	"setupDone":false,
+	"twoFA":"allow",
+	"twoFAMode":"simple",
+	"db":"mysql",
+	"payments":"stripe",
+	"name":"libreevent",
+	"yourDomain":"",
+	"mailSender":"",
+	"maxTickets":10,
+	"currency":"USD",
+	"gcInterval":300,
+	"ticketTimeout":900,
+	"startPage":"default",
+	"version":"1.0.1"
+}

simple/package.json

@@ -0,0 +1,26 @@
+{
+  "name": "libreevent-simple",
+  "version": "1.0.0",
+  "description": "Simplify libreevent's install using the npm package",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/janishutz/libreevent.git"
+  },
+  "keywords": [
+    "libreevent",
+    "simple"
+  ],
+  "author": "Janis Hutz",
+  "license": "GPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/janishutz/libreevent/issues"
+  },
+  "homepage": "https://libreevent.janishutz.com",
+  "dependencies": {
+    "libreevent": "^1.1.3"
+  }
+}

simple/setupkey.txt

@@ -0,0 +1 @@
+awe0g9pü02w 3tvaä9p4'efgt$ä'4fgtaäaw34ftg$a3qwf4t'p93wft3waqäü

src/server/admin/adminAPIRoutes.js

@@ -15,7 +15,7 @@ const mlt = require( 'multer' );
 const pngToIco = require( 'png-to-ico' );
 const multer = mlt();
 const fs = require( 'fs' );
-const settings = JSON.parse( fs.readFileSync( path.join( __dirname + '/../config/settings.config.json' ) ) );
+const settings = JSON.parse( fs.readFileSync( path.join( __starterDir + '/config/settings.config.json' ) ) );
 const getHandler = new geth( settings );
 const postHandler = new posth( settings );
 

src/server/app.js

@@ -1,114 +1,3 @@
-/*
+const libreevent = require( './index.js' );
-*				libreevent - app.js
-*
-*	Created by Janis Hutz 02/26/2023, Licensed under the GPL V3 License
-*			https://janishutz.com, development@janishutz.com
-*
-*
-*/
 
-const express = require( 'express' );
+libreevent.run( __dirname );
-let app = express();
-const path = require( 'path' );
-const expressSession = require( 'express-session' );
-const cookieParser = require( 'cookie-parser' );
-const http = require( 'http' );
-const fs = require( 'fs' );
-const token = require( './backend/token.js' );
-
-console.log( `
-
- _ _ _                                   _   
-| (_) |                                 | |  
-| |_| |__  _ __ ___  _____   _____ _ __ | |_ 
-| | | '_ \\| '__/ _ \\/ _ \\ \\ / / _ \\ '_ \\| __|
-| | | |_) | | |  __/  __/\\ V /  __/ | | | |_ 
-|_|_|_.__/|_|  \\___|\\___| \\_/ \\___|_| |_|\\__|
-                                             
-                                             
-
-
-    -------------------------------
-    
-    ==> Welcome to libreevent!
-
-
-    ==> You are running Version V1.0.0
-
-Below you can see all important things that happen during operation.
-libreevent logs all errors in the console such that they appear in the
-log files when running it with an output pipe (which you should definitely do)
-
-To do this run the following command when starting libreevent:
-'node app.js > libreevent_log.txt'
-
-` );
-
-console.log( '[ Server ] loading settings' );
-const settings = JSON.parse( fs.readFileSync( path.join( __dirname + '/config/settings.config.json' ) ) );
-
-
-// Route for static html file for start page (page is compiled using
-// Vue SSR and gets its support files (e.g. CSS and JS files) from 
-// the /home/supportFiles/:file route plus its assets from the /otherAssets/:file
-// route).
-if ( settings.setupDone ) {
-    app.get( '/', ( req, res ) => {
-        res.sendFile( path.join( __dirname + '/ui/home/active/en/index.html' ) );
-    } );
-}
-
-
-// Set up static routes for static file serving (performance wise not
-// that good, but way easier to set up)
-console.log( '[ Server ] Setting up static routes' );
-if ( settings.setupDone ) {
-    app.use( express.static( 'webapp/main/dist' ) );
-} else {
-    app.use( express.static( 'webapp/setup/dist' ) );
-}
-
-// initialise express with middlewares
-console.log( '[ Server ] loading and initializing middlewares' );
-app.use( expressSession( {
-    secret: token.generateToken( 60 ),
-    resave: false,
-    saveUninitialized: true,
-    cookie: {
-        sameSite: 'none',
-        httpOnly: true,
-        secure: false,
-    }
-} ) );
-
-app.use( cookieParser() );
-
-let file = path.join( __dirname + '/webapp/main/dist/index.html' );
-
-if ( settings.setupDone ) {
-    console.log( '[ Server ] loading backend components' );
-    require( './backend/helperRoutes.js' )( app, settings ); // Helper routes
-    require( './admin/adminRoutes.js' )( app, settings ); // admin routes
-    require( './admin/adminAPIRoutes.js' )( app, settings ); // admin api routes
-    require( './admin/appApiRoutes.js' )( app, settings ); // app api routes
-    require( './backend/userAPIRoutes.js' )( app, settings ); // user api routes
-    require( './backend/userRoutes.js' )( app, settings ); // user routes
-    require( './backend/payments/paymentRoutes.js' )( app, settings ); // payment routes
-    require( './backend/plugins/pluginLoader.js' )( app, settings ); // plugin loader
-} else {
-    console.log( '[ Setup ] Loading setup routes' );
-    require( './setup/setupRoutes.js' )( app, settings ); // setup routes
-    file = path.join( __dirname + '/webapp/setup/dist/index.html' );
-}
-
-// handling of any unknown route. Returns the SPA index.html file which
-// initiates loading of the SPA
-app.use( ( request, response ) => {
-    response.sendFile( file );
-} );
-
-console.log( '\n\n[ Server ] loading complete!\n\n' );
-
-const PORT = process.env.PORT || 8080;
-console.log( '[ Server ] listening on port ' + PORT );
-http.createServer( app ).listen( PORT );

src/server/backend/api/postHandler.js

@@ -20,7 +20,7 @@ class POSTHandler {
         this.temporarilySelectedTotals = {};
         this.temporaryTotals = {};
         this.freeSeats = {};
-        this.settings = JSON.parse( fs.readFileSync( path.join( __dirname + '/../../config/settings.config.json' ) ) );
+        this.settings = JSON.parse( fs.readFileSync( path.join( __starterDir + '/config/settings.config.json' ) ) );
 
         /*
             Here, GC-Duty is scheduled to run every so often (defined in settings.config.json file, no GUI setting available.

src/server/backend/credentials/pwdmanager.js

@@ -23,7 +23,7 @@ const token = require( '../token.js' );
 let createSSRApp = require( 'vue' ).createSSRApp;
 let renderToString = require( 'vue/server-renderer' ).renderToString;
 
-const settings = JSON.parse( fs.readFileSync( path.join( __dirname + '/../../config/settings.config.json' ) ) );
+const settings = JSON.parse( fs.readFileSync( path.join( __starterDir + '/config/settings.config.json' ) ) );
 
 module.exports.checkpassword = function checkpassword ( email, password ) {
     return new Promise( resolve => {

src/server/backend/db/db.js

@@ -10,7 +10,7 @@
 const path = require( 'path' );
 const fs = require( 'fs' );
 
-const settings = JSON.parse( fs.readFileSync( path.join( __dirname + '/../../config/settings.config.json' ) ) );
+const settings = JSON.parse( fs.readFileSync( path.join( __starterDir + '/config/settings.config.json' ) ) );
 
 const dbRef = { 
     'user': 'libreevent_users', 
@@ -230,5 +230,5 @@ module.exports.saveSettings = ( settings ) => {
             settingsToSave += settingsString[ letter ];
         }
     }
-    fs.writeFileSync( path.join( __dirname + '/../../config/settings.config.json' ), settingsToSave );
+    fs.writeFileSync( path.join( __starterDir + '/config/settings.config.json' ), settingsToSave );
 };

src/server/backend/db/mysqldb.js

@@ -16,7 +16,7 @@ const path = require( 'path' );
 
 class SQLDB {
     constructor ( ) {
-        this.sqlConnection = mysql.createConnection( JSON.parse( fs.readFileSync( path.join( __dirname + '/../../config/db.config.json' ) ) ) );
+        this.sqlConnection = mysql.createConnection( JSON.parse( fs.readFileSync( path.join( __starterDir + '/config/db.config.json' ) ) ) );
     }
 
     connect ( ) {

src/server/backend/mail/mailSender.js

@@ -12,7 +12,7 @@ const html2text = require( 'html-to-text' );
 
 const db = require( '../db/db.js' );
 
-let transporter = mailer.createTransport( db.getJSONDataSync( '/config/mail.config.json' ) );
+let transporter = mailer.createTransport( db.getJSONDataSync( __starterDir + '/config/mail.config.json' ) );
 
 
 class MailManager {

src/server/backend/plugins/manager.js

@@ -32,7 +32,7 @@ class PluginManager {
 
     loadPaymentGatewaySettings () {
         return new Promise( ( resolve, reject ) => {
-            this.paymentGateway = JSON.parse( fs.readFileSync( path.join( __dirname + '/../../config/settings.config.json' ) ) ).payments;
+            this.paymentGateway = JSON.parse( fs.readFileSync( path.join( __starterDir + '/config/settings.config.json' ) ) ).payments;
             fs.readFile( path.join( __dirname + '/payments/' + this.paymentGateway + '/configOptions.json' ), ( err, optionsBuffer ) => {
                 if ( err ) reject( err );
                 fs.readFile( path.join( __dirname + '/payments/' + this.paymentGateway + '/config.payments.json' ), ( err, configBuffer ) => {

src/server/backend/tickets/ticketGenerator.js

@@ -18,7 +18,7 @@ const mailManager = new mm();
 let createSSRApp = require( 'vue' ).createSSRApp;
 let renderToString = require( 'vue/server-renderer' ).renderToString;
 
-const settings = JSON.parse( fs.readFileSync( path.join( __dirname + '/../../config/settings.config.json' ) ) );
+const settings = JSON.parse( fs.readFileSync( path.join( __starterDir + '/config/settings.config.json' ) ) );
 
 class TicketGenerator {
     constructor () {

src/server/index.js

@@ -0,0 +1,118 @@
+/*
+*				libreevent - app.js
+*
+*	Created by Janis Hutz 02/26/2023, Licensed under the GPL V3 License
+*			https://janishutz.com, development@janishutz.com
+*
+*
+*/
+
+const express = require( 'express' );
+let app = express();
+const path = require( 'path' );
+const expressSession = require( 'express-session' );
+const cookieParser = require( 'cookie-parser' );
+const http = require( 'http' );
+const fs = require( 'fs' );
+const token = require( './backend/token.js' );
+
+module.exports.run = ( rootDir ) => {
+    global.__starterDir = rootDir ?? __dirname;
+    console.log( `
+
+    _ _ _                                   _   
+    | (_) |                                 | |  
+    | |_| |__  _ __ ___  _____   _____ _ __ | |_ 
+    | | | '_ \\| '__/ _ \\/ _ \\ \\ / / _ \\ '_ \\| __|
+    | | | |_) | | |  __/  __/\\ V /  __/ | | | |_ 
+    |_|_|_.__/|_|  \\___|\\___| \\_/ \\___|_| |_|\\__|
+                                                
+                                                
+
+
+        -------------------------------
+        
+        ==> Welcome to libreevent!
+
+
+        ==> You are running Version V1.0.0
+
+    Below you can see all important things that happen during operation.
+    libreevent logs all errors in the console such that they appear in the
+    log files when running it with an output pipe (which you should definitely do)
+
+    To do this run the following command when starting libreevent:
+    'node app.js > libreevent_log.txt'
+
+    ` );
+
+    console.log( '[ Server ] loading settings' );
+    const settings = JSON.parse( fs.readFileSync( path.join( __starterDir + '/config/settings.config.json' ) ) );
+
+
+    // Route for static html file for start page (page is compiled using
+    // Vue SSR and gets its support files (e.g. CSS and JS files) from 
+    // the /home/supportFiles/:file route plus its assets from the /otherAssets/:file
+    // route).
+    if ( settings.setupDone ) {
+        app.get( '/', ( req, res ) => {
+            res.sendFile( path.join( __dirname + '/ui/home/active/en/index.html' ) );
+        } );
+    }
+
+
+    // Set up static routes for static file serving (performance wise not
+    // that good, but way easier to set up)
+    console.log( '[ Server ] Setting up static routes' );
+    if ( settings.setupDone ) {
+        app.use( express.static( __dirname + '/webapp/main/dist' ) );
+    } else {
+        console.log( '[ Server ] Booting into setup' );
+        app.use( express.static( __dirname + '/webapp/setup/dist' ) );
+    }
+
+    // initialise express with middlewares
+    console.log( '[ Server ] loading and initializing middlewares' );
+    app.use( expressSession( {
+        secret: token.generateToken( 60 ),
+        resave: false,
+        saveUninitialized: true,
+        cookie: {
+            sameSite: 'none',
+            httpOnly: true,
+            secure: false,
+        }
+    } ) );
+
+    app.use( cookieParser() );
+
+    let file = path.join( __dirname + '/webapp/main/dist/index.html' );
+
+    if ( settings.setupDone ) {
+        console.log( '[ Server ] loading backend components' );
+        require( './backend/helperRoutes.js' )( app, settings ); // Helper routes
+        require( './admin/adminRoutes.js' )( app, settings ); // admin routes
+        require( './admin/adminAPIRoutes.js' )( app, settings ); // admin api routes
+        require( './admin/appApiRoutes.js' )( app, settings ); // app api routes
+        require( './backend/userAPIRoutes.js' )( app, settings ); // user api routes
+        require( './backend/userRoutes.js' )( app, settings ); // user routes
+        require( './backend/payments/paymentRoutes.js' )( app, settings ); // payment routes
+        require( './backend/plugins/pluginLoader.js' )( app, settings ); // plugin loader
+    } else {
+        console.log( '[ Setup ] Loading setup routes' );
+        require( './setup/setupRoutes.js' )( app, settings ); // setup routes
+        file = path.join( __dirname + '/webapp/setup/dist/index.html' );
+    }
+
+    // handling of any unknown route. Returns the SPA index.html file which
+    // initiates loading of the SPA
+    app.use( ( request, response ) => {
+        response.sendFile( file );
+    } );
+
+    console.log( '\n\n[ Server ] loading complete!\n\n' );
+
+    const PORT = process.env.PORT || 8080;
+    console.log( '[ Server ] listening on port ' + PORT );
+    http.createServer( app ).listen( PORT );
+}

src/server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "libreevent",
-  "version": "1.0.7",
+  "version": "1.1.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "libreevent",
-      "version": "1.0.7",
+      "version": "1.1.5",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@pdfme/generator": "^1.2.6",
@@ -520,9 +520,10 @@
       }
     },
     "node_modules/body-parser": {
-      "version": "1.20.2",
+      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "content-type": "~1.0.5",
@@ -532,7 +533,7 @@
         "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
@@ -555,20 +556,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/body-parser/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -642,12 +629,19 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
+      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
+        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.0.2"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -870,6 +864,23 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "license": "MIT",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -985,9 +996,10 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -1013,6 +1025,27 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -1032,36 +1065,37 @@
       }
     },
     "node_modules/express": {
-      "version": "4.19.2",
+      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",
-      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==",
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.2",
+        "body-parser": "1.20.3",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
         "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
+        "finalhandler": "1.3.1",
         "fresh": "0.5.2",
         "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
+        "merge-descriptors": "1.0.3",
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
+        "path-to-regexp": "0.1.10",
         "proxy-addr": "~2.0.7",
-        "qs": "6.11.0",
+        "qs": "6.13.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.18.0",
+        "send": "0.19.0",
-        "serve-static": "1.15.0",
+        "serve-static": "1.16.2",
         "setprototypeof": "1.2.0",
         "statuses": "2.0.1",
         "type-is": "~1.6.18",
@@ -1132,32 +1166,19 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/express/node_modules/qs": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
-      "dependencies": {
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/finalhandler": {
-      "version": "1.2.0",
+      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
@@ -1172,6 +1193,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -1179,7 +1201,8 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
     "node_modules/find-up": {
       "version": "6.3.0",
@@ -1297,9 +1320,13 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
+      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/gauge": {
       "version": "3.0.2",
@@ -1321,13 +1348,19 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.0",
+      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
+        "es-errors": "^1.3.0",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
-        "has-symbols": "^1.0.3"
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1363,15 +1396,28 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has": {
+    "node_modules/has-property-descriptors": {
-      "version": "1.0.3",
+      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1"
+        "es-define-property": "^1.0.0"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-symbols": {
@@ -1404,6 +1450,18 @@
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
     },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/html-minifier-terser": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
@@ -1729,9 +1787,13 @@
       }
     },
     "node_modules/merge-descriptors": {
-      "version": "1.0.1",
+      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
     "node_modules/methods": {
       "version": "1.1.2",
@@ -1745,6 +1807,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "license": "MIT",
       "bin": {
         "mime": "cli.js"
       },
@@ -2031,9 +2094,13 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
+      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2158,9 +2225,10 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.7",
+      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==",
+      "license": "MIT"
     },
     "node_modules/pdf-lib": {
       "version": "1.17.1",
@@ -2270,11 +2338,12 @@
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/qs": {
-      "version": "6.11.2",
+      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.4"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -2439,9 +2508,10 @@
       }
     },
     "node_modules/send": {
-      "version": "0.18.0",
+      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+      "license": "MIT",
       "dependencies": {
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -2465,6 +2535,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -2472,7 +2543,17 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
+    },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
     "node_modules/serve-favicon": {
       "version": "2.5.0",
@@ -2500,14 +2581,15 @@
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
     "node_modules/serve-static": {
-      "version": "1.15.0",
+      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
+      "license": "MIT",
       "dependencies": {
-        "encodeurl": "~1.0.2",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.18.0"
+        "send": "0.19.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -2518,19 +2600,41 @@
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
     },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
+      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.0.2",
+        "es-errors": "^1.3.0",
-        "object-inspect": "^1.9.0"
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"

src/server/package.json

@@ -1,8 +1,8 @@
 {
   "name": "libreevent",
-  "version": "1.0.7",
+  "version": "1.1.5",
   "description": "Free & Open source event management solution",
-  "main": "app.js",
+  "main": "index.js",
   "directories": {
     "doc": "docs"
   },

src/server/setup/setupRoutes.js

@@ -21,7 +21,7 @@ module.exports = ( app, settings ) => {
     */
    
     app.post( '/setup/start', bodyParser.json(), ( request, response ) => {
-        if ( request.body.token === '' + fs.readFileSync( path.join( __dirname + '/../setupkey.txt' ) ) ) {
+        if ( request.body.token === '' + fs.readFileSync( path.join( __starterDir + '/setupkey.txt' ) ) ) {
             request.session.setupKeyOk = true;
             response.send( 'ok' );
         } else {
@@ -39,7 +39,7 @@ module.exports = ( app, settings ) => {
 
     app.post( '/setup/saveBasicSettings', bodyParser.json(), ( req, res ) => {
         if ( req.session.setupKeyOk ) {
-            fs.writeFileSync( path.join( __dirname + '/../config/db.config.json' ), JSON.stringify( req.body.db ) );
+            fs.writeFileSync( path.join( __starterDir + '/config/db.config.json' ), JSON.stringify( req.body.db ) );
             let emailSettings = {};
             emailSettings[ 'host' ] = req.body.email.host;
             emailSettings[ 'port' ] = req.body.email.port;
@@ -47,7 +47,7 @@ module.exports = ( app, settings ) => {
             emailSettings[ 'auth' ] = { 'user': req.body.email.user, 'pass': req.body.email.pass };
             let hostSplit = req.body.email.host.split( '.' );
             emailSettings[ 'tls' ] = { 'servername': ( hostSplit[ hostSplit.length - 2 ] + '.' + hostSplit[ hostSplit.length - 1 ] ) };
-            fs.writeFileSync( path.join( __dirname + '/../config/mail.config.json' ), JSON.stringify( emailSettings ) );
+            fs.writeFileSync( path.join( __starterDir + '/config/mail.config.json' ), JSON.stringify( emailSettings ) );
             if ( db === null ) {
                 db = require( '../backend/db/db.js' );
                 pwm = require( '../admin/pwdmanager.js' );

src/webapp/main/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreevent",
-  "version": "1.0.7",
+  "version": "1.1.5",
   "private": false,
   "scripts": {
     "dev": "vite --host",
@@ -18,9 +18,9 @@
     "vue3-draggable-resizable": "^1.6.5"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^1.10.2",
+    "@vitejs/plugin-vue": "^5.1.4",
-    "vite": "^2.9.18",
     "eslint": "^8.39.0",
-    "eslint-plugin-vue": "^9.17.0"
+    "eslint-plugin-vue": "^9.17.0",
+    "vite": "^5.4.6"
   }
 }

src/webapp/setup/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "libreevent-setup",
-  "version": "1.0.7",
+  "version": "1.1.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "libreevent-setup",
-      "version": "1.0.7",
+      "version": "1.1.5",
       "dependencies": {
         "pinia": "^2.1.3",
         "vue": "^3.3.4",
@@ -1705,10 +1705,11 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.29.4",
+      "version": "3.29.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz",
-      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
+      "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -1869,10 +1870,11 @@
       "dev": true
     },
     "node_modules/vite": {
-      "version": "4.5.3",
+      "version": "4.5.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz",
-      "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==",
+      "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.18.10",
         "postcss": "^8.4.27",

src/webapp/setup/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreevent-setup",
-  "version": "1.0.7",
+  "version": "1.1.5",
   "private": true,
   "scripts": {
     "dev": "vite",