Finish version bump

Bump tar and pdfjs-dist in /src/webapp/main

package.json

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

package.sh

@@ -6,7 +6,7 @@
 #
 #
 
-v="V1.1.15"
+v="V1.1.16"
 
 echo "
  _ _ _                                   _   
@@ -75,6 +75,15 @@ sleep 1
 
 echo "
 
+==> Updating dependencies of backend <==
+
+"
+
+npm audit fix --force
+sleep 1
+
+echo " 
+
 ==> Collecting files to archive <==
 
 "

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

@@ -6,6 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/usr/share/java/gradle" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>

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

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">

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

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

src/apps/Android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    <uses-feature android:name="android.hardware.camera" android:required="true" />
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="true"
+        tools:ignore="UnnecessaryRequiredFeature" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -11,7 +16,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.LibreeventEntryControl"
-        tools:targetApi="31">
+        tools:targetApi="35">
         <activity
             android:name=".MainActivity"
             android:exported="true">
@@ -26,8 +31,4 @@
             android:exported="true">
         </activity>
     </application>
-    <uses-feature android:name="android.hardware.camera" android:required="true" />
-    <uses-feature android:name="android.hardware.camera.autofocus" android:required="true" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

src/apps/Android/app/src/main/java/com/janishutz/libreevent/ScannerActivity.kt

@@ -13,6 +13,7 @@ import com.journeyapps.barcodescanner.CaptureActivity
 import com.journeyapps.barcodescanner.CaptureManager
 import com.journeyapps.barcodescanner.DecoratedBarcodeView
 import java.util.Date
+import androidx.core.content.edit
 
 class ScannerActivity : CaptureActivity() {
 
@@ -30,10 +31,10 @@ class ScannerActivity : CaptureActivity() {
         val logoutButton = findViewById<Button>(R.id.logoutButton)
         logoutButton.setOnClickListener {
             val sharedPref = applicationContext.getSharedPreferences( "login", MODE_PRIVATE )
-            val editor = sharedPref.edit()
+            sharedPref.edit {
-            editor.remove( "password" )
+                remove("password")
-            editor.remove( "loginOk" )
+                remove("loginOk")
-            editor.apply()
+            }
             val switchIntent = Intent(this, MainActivity::class.java)
             switchIntent.putExtra("hasSwitched", true)
             startActivity(switchIntent)
@@ -52,14 +53,12 @@ class ScannerActivity : CaptureActivity() {
 
         captureManager.initializeFromIntent(intent, null)
         captureManager.decode()
-        barcodeView.decodeContinuous(object : BarcodeCallback {
+        barcodeView.decodeContinuous { result ->
-            override fun barcodeResult(result: BarcodeResult?) {
+            if (result != null) {
-                if (result != null) {
+                val scannedData = result.text // This is the scanned data (e.g., QR code content)
-                    val scannedData = result.text // This is the scanned data (e.g., QR code content)
+                handleScanResult(scannedData)
-                    handleScanResult(scannedData)
-                }
             }
-        })
+        }
     }
 
     private fun handleScanResult(result: String) {
@@ -73,13 +72,17 @@ class ScannerActivity : CaptureActivity() {
             lastScanned = result
             val alertDialogBuilder = AlertDialog.Builder(this)
 
-            if ( status == "ticketValid" ) {
+            when (status) {
-                alertDialogBuilder.setTitle("Ticket is valid")
+                "ticketValid" -> {
-            } else if ( status == "ticketInvalid" ) {
+                    alertDialogBuilder.setTitle("Ticket is valid")
-                alertDialogBuilder.setTitle("Ticket is invalid")
+                }
-            } else if ( status == "Error" ) {
+                "ticketInvalid" -> {
-                alertDialogBuilder.setTitle("There was an error connecting")
+                    alertDialogBuilder.setTitle("Ticket is invalid")
-                alertDialogBuilder.setMessage("Please log out and log in again")
+                }
+                "Error" -> {
+                    alertDialogBuilder.setTitle("There was an error connecting")
+                    alertDialogBuilder.setMessage("Please log out and log in again")
+                }
             }
 
             alertDialogBuilder.setIcon(android.R.drawable.ic_dialog_alert)

src/apps/Android/app/src/main/res/layout/activity_scanner.xml

@@ -10,13 +10,14 @@
     <com.journeyapps.barcodescanner.DecoratedBarcodeView
         android:id="@+id/barcodeScannerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <Button
             android:id="@+id/logoutButton"
             android:layout_width="122dp"
             android:layout_height="wrap_content"
-            android:text="Log out" />
+            android:text="@string/log_out" />
+
     </com.journeyapps.barcodescanner.DecoratedBarcodeView>
 
 </FrameLayout>

src/apps/Android/app/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">libreevent entry control</string>
+    <string name="log_out">Log out</string>
 </resources>

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.9.1" apply false
+    id("com.android.application") version "8.13.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.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/server/package.json

@@ -9,7 +9,7 @@
     "dependencies": {
         "@pdfme/generator": "^5.3.15",
         "axios": "^1.8.4",
-        "bcrypt": "^5.1.1",
+        "bcrypt": "^6.0.0",
         "body-parser": "^1.20.3",
         "crypto-js": "^4.2.0",
         "express": "^4.21.2",

src/webapp/setup/package-lock.json

@@ -992,7 +992,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
       "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1252,7 +1251,6 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.45.0.tgz",
       "integrity": "sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.4.0",
@@ -1727,10 +1725,11 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
+      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
@@ -1922,7 +1921,6 @@
       "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -2304,7 +2302,6 @@
       "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.4.4",
@@ -2378,7 +2375,6 @@
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
       "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.3.4",
         "@vue/compiler-sfc": "3.3.4",