Finish version bump & security fixes

Bump form-data from 4.0.2 to 4.0.4 in /src/server

.gitignore

@@ -24,5 +24,9 @@ node_modules
 *.synctex.gz
 *.fdb_latexmk
 ._wordcount_selection.tex
+/*.zip
 
 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">
+    <a href="https://store.janishutz.com/donate">
         <img src="https://store-cdn.janishutz.com/static/support-me.jpg" width="150px">
+    </a>
 </div>

SECURITY.md

@@ -6,7 +6,7 @@ libreevent gets security updates as part of regular software updates. Since ther
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.0.x   | :white_check_mark: |
+| 1.x.x   | :white_check_mark: |
 | 0.x.x   | :x:                |
 
 ## Reporting a Vulnerability

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.5",
+  "version": "1.1.15",
   "description": "A free and open source event management solution",
   "main": "/dist/app.js",
   "scripts": {

package.sh

@@ -6,7 +6,7 @@
 #
 #
 
-v="V1.0.5"
+v="V1.1.15"
 
 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 ../../
-rm -rf dist
+echo " 
+
+==> 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/apps/Android/.idea/AndroidProjectSystem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>

src/apps/Android/.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>

src/apps/Android/.idea/deploymentTargetSelector.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2025-04-18T11:32:08.036063878Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/janis/.android/avd/Pixel_9_Pro_XL.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

src/apps/Android/.idea/gradle.xml

@@ -4,10 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

src/apps/Android/.idea/migrations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

src/apps/Android/.idea/misc.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

src/apps/Android/.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

src/apps/Android/app/build.gradle.kts

@@ -5,14 +5,14 @@ plugins {
 
 android {
     namespace = "com.janishutz.libreevent"
-    compileSdk = 33
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.janishutz.libreevent"
         minSdk = 24
-        targetSdk = 33
-        versionCode = 2
-        versionName = "1.0"
+        targetSdk = 35
+        versionCode = 5
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

src/apps/Android/build.gradle.kts

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.1.1" apply false
+    id("com.android.application") version "8.9.1" apply false
     id("org.jetbrains.kotlin.android") version "1.9.0" apply false
 }

src/apps/Android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Sep 03 11:15:46 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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 @@
-/*
-*				libreevent - app.js
-*
-*	Created by Janis Hutz 02/26/2023, Licensed under the GPL V3 License
-*			https://janishutz.com, development@janishutz.com
-*
-*
-*/
+const libreevent = require( './index.js' );
 
-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' );
-
-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 );
+libreevent.run( __dirname );

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,115 @@
+/*
+*				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 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,
+        }
+    } ) );
+
+    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.json

@@ -1,67 +1,28 @@
 {
     "name": "libreevent",
-  "version": "1.0.5",
+    "version": "1.1.15",
     "description": "Free & Open source event management solution",
-  "main": "app.js",
+    "main": "index.js",
     "directories": {
         "doc": "docs"
     },
-  "devDependencies": {
-    "acorn": "^8.8.2",
-    "buffer-from": "^1.1.2",
-    "camel-case": "^4.1.2",
-    "clean-css": "^5.3.2",
-    "commander": "^9.5.0",
-    "css-b64-images": "^0.2.5",
-    "debug": "^4.3.4",
-    "dot-case": "^3.0.4",
-    "entities": "^4.4.0",
-    "find-up": "^6.3.0",
-    "html-minifier-terser": "^7.1.0",
-    "jju": "^1.4.0",
-    "locate-path": "^7.2.0",
-    "lower-case": "^2.0.2",
-    "minify": "^9.2.0",
-    "ms": "^2.1.2",
-    "no-case": "^3.0.4",
-    "p-limit": "^4.0.0",
-    "p-locate": "^6.0.0",
-    "param-case": "^3.0.4",
-    "pascal-case": "^3.1.2",
-    "path-exists": "^5.0.0",
-    "readjson": "^2.2.2",
-    "relateurl": "^0.2.7",
-    "response-time": "^2.3.2",
-    "simport": "^1.2.0",
-    "source-map": "^0.6.1",
-    "source-map-support": "^0.5.21",
-    "terser": "^5.16.5",
-    "try-catch": "^3.0.1",
-    "try-to-catch": "^3.0.1",
-    "tslib": "^2.5.0",
-    "yocto-queue": "^1.0.0"
-  },
     "dependencies": {
-    "@pdfme/generator": "^1.2.6",
-    "@seald-io/nedb": "^4.0.2",
-    "axios": "^1.6.0",
-    "bcrypt": "^5.0.1",
-    "body-parser": "^1.20.2",
-    "cookie-parser": "^1.4.6",
+        "@pdfme/generator": "^5.3.15",
+        "axios": "^1.8.4",
+        "bcrypt": "^5.1.1",
+        "body-parser": "^1.20.3",
         "crypto-js": "^4.2.0",
-    "express": "^4.19.2",
-    "express-session": "^1.17.3",
+        "express": "^4.21.2",
+        "express-session": "^1.18.1",
         "html-to-text": "^9.0.5",
-    "multer": "^1.4.5-lts.1",
+        "multer": "^2.0.0",
         "mysql": "^2.18.1",
-    "nodemailer": "^6.9.3",
+        "nodemailer": "^7.0.10",
         "pdf-lib": "^1.17.1",
         "png-to-ico": "^2.1.8",
-    "qs": "^6.11.2",
-    "serve-favicon": "^2.5.0",
-    "serve-static": "^1.15.0",
-    "stripe": "^12.14.0",
-    "vue": "^3.3.4"
+        "qs": "^6.14.0",
+        "stripe": "^12.18.0",
+        "vue": "^3.5.13"
     },
     "scripts": {
         "lint": "eslint . --ext .js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"

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/server/webapp

@@ -1 +0,0 @@
-../webapp/

src/webapp/main/package.json

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

src/webapp/setup/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreevent-setup",
-  "version": "1.0.5",
+  "version": "1.1.15",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -14,9 +14,9 @@
     "vue-router": "^4.2.2"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^4.2.3",
+    "@vitejs/plugin-vue": "^5.2.3",
     "eslint": "^8.39.0",
     "eslint-plugin-vue": "^9.11.0",
-    "vite": "^4.5.3"
+    "vite": "^6.2.2"
   }
 }

website/dist/docs/setup/index.html

@@ -20,7 +20,7 @@
                     <div id="doc-container">
                     <h1>Getting Started</h1>
 <p>In this tutorial, you are going to learn how to set up and configure libreevent.</p>
-<p>Installing libreevent will take you about 2 hour, if you have never made anything similar before. If you don't want to deal with the installation, you may contact us <a href="https://support.janishutz.com/index.php?a=add&amp;category=8">here</a>, so we can set it up for you.</p>
+<p>Installing libreevent will take you about 2 hour, if you have never made anything similar before. If you don't want to deal with the installation, you may pay so that I can set it up for you <a href="https://store.janishutz.com/product/libreeventSetup">here</a>.</p>
 <p>Let's begin the installation <a href="/docs/setup/installation">here</a>!</p>
 </div>
                 </div>

website/dist/docs/setup/installation/index.html

@@ -19,7 +19,7 @@
                 <div id="docPage">
                     <div id="doc-container">
                     <h1>Installation</h1>
-<p>Let's begin with setting up libreevent! If you are not technically savvy or want somebody else to set it up for you, please contact me <a href="https://support.janishutz.com/index.php?a=add&amp;category=8">here</a>. If you want to set it up yourself, read on below!</p>
+<p>Let's begin with setting up libreevent! If you are not technically savvy or want somebody else to set it up for you, you can pay for the setup <a href="https://store.janishutz.com/product/com.janishutz.libreeventSetup">here</a>. If you want to set it up yourself, read on below!</p>
 <h1>Selecting a webhosting company</h1>
 <p>Choosing the right hosting provider is not easy, especially since libreevent requires node.js. Therefore, we've listed a few excellent options. Whatever hosting provider you end up going with, it is important that they explicitly list Node.js as a feature of that hosting account. All hosting providers below also include MySQL which is beneficial to have and a must-have when you are expecting to sell a lot of tickets simultaneously. This website here is hosted by asurahosting. <em>Note: I may receive a small commission when you buy webhosting using one of the links provided below. This won't affect the price you pay.</em></p>
 <ul>

website/src/setup.md

@@ -1,6 +1,6 @@
 # Getting Started
 In this tutorial, you are going to learn how to set up and configure libreevent.
 
-Installing libreevent will take you about 2 hour, if you have never made anything similar before. If you don't want to deal with the installation, you may contact us [here](https://support.janishutz.com/index.php?a=add&category=8), so we can set it up for you.
+Installing libreevent will take you about 2 hour, if you have never made anything similar before. If you don't want to deal with the installation, you may pay so that I can set it up for you [here](https://store.janishutz.com/product/libreeventSetup).
 
 Let's begin the installation [here](&/setup/installation)!

website/src/setup/installation.md

@@ -1,5 +1,5 @@
 # Installation
-Let's begin with setting up libreevent! If you are not technically savvy or want somebody else to set it up for you, please contact me [here](https://support.janishutz.com/index.php?a=add&category=8). If you want to set it up yourself, read on below!
+Let's begin with setting up libreevent! If you are not technically savvy or want somebody else to set it up for you, you can pay for the setup [here](https://store.janishutz.com/product/com.janishutz.libreeventSetup). If you want to set it up yourself, read on below!
 
 
 # Selecting a webhosting company