mirror of
https://github.com/janishutz/libreevent.git
synced 2026-03-14 07:00:05 +01:00
Compare commits
19 Commits
V1.1.14
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95615183e6 | ||
| 01f2752fcb | |||
|
|
89d7ca4379 | ||
|
|
aad3f47e41 | ||
|
|
ad2a86c3ab | ||
|
|
fa104cc100 | ||
|
|
04db517ff1 | ||
|
|
20f841367b | ||
|
|
707091be2b | ||
|
|
e15ed09735 | ||
|
|
e67fac0436 | ||
|
|
28ebd7da97 | ||
| f7ea972264 | |||
| 28acb2070c | |||
|
|
000339add6 | ||
|
|
2895709c73 | ||
|
|
cda7769398 | ||
|
|
19ecd7b1db | ||
| 0219e718dc |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "libreevent",
|
||||
"version": "1.1.14",
|
||||
"version": "1.1.16",
|
||||
"description": "A free and open source event management solution",
|
||||
"main": "/dist/app.js",
|
||||
"scripts": {
|
||||
|
||||
11
package.sh
11
package.sh
@@ -6,7 +6,7 @@
|
||||
#
|
||||
#
|
||||
|
||||
v="V1.1.14"
|
||||
v="V1.1.16"
|
||||
|
||||
echo "
|
||||
_ _ _ _
|
||||
@@ -73,6 +73,15 @@ node prepareDB.js
|
||||
|
||||
sleep 1
|
||||
|
||||
echo "
|
||||
|
||||
==> Updating dependencies of backend <==
|
||||
|
||||
"
|
||||
|
||||
npm audit fix --force
|
||||
sleep 1
|
||||
|
||||
echo "
|
||||
|
||||
==> Collecting files to archive <==
|
||||
|
||||
1
src/apps/Android/.idea/gradle.xml
generated
1
src/apps/Android/.idea/gradle.xml
generated
@@ -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>
|
||||
|
||||
1
src/apps/Android/.idea/misc.xml
generated
1
src/apps/Android/.idea/misc.xml
generated
@@ -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">
|
||||
|
||||
@@ -5,14 +5,14 @@ plugins {
|
||||
|
||||
android {
|
||||
namespace = "com.janishutz.libreevent"
|
||||
compileSdk = 35
|
||||
compileSdk = 36
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.janishutz.libreevent"
|
||||
minSdk = 24
|
||||
targetSdk = 35
|
||||
versionCode = 5
|
||||
versionName = "1.0.1"
|
||||
targetSdk = 36
|
||||
versionCode = 6
|
||||
versionName = "1.1.0"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -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>
|
||||
@@ -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()
|
||||
editor.remove( "password" )
|
||||
editor.remove( "loginOk" )
|
||||
editor.apply()
|
||||
sharedPref.edit {
|
||||
remove("password")
|
||||
remove("loginOk")
|
||||
}
|
||||
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 {
|
||||
override fun barcodeResult(result: BarcodeResult?) {
|
||||
if (result != null) {
|
||||
val scannedData = result.text // This is the scanned data (e.g., QR code content)
|
||||
handleScanResult(scannedData)
|
||||
}
|
||||
barcodeView.decodeContinuous { result ->
|
||||
if (result != null) {
|
||||
val scannedData = result.text // This is the scanned data (e.g., QR code content)
|
||||
handleScanResult(scannedData)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleScanResult(result: String) {
|
||||
@@ -73,13 +72,17 @@ class ScannerActivity : CaptureActivity() {
|
||||
lastScanned = result
|
||||
val alertDialogBuilder = AlertDialog.Builder(this)
|
||||
|
||||
if ( status == "ticketValid" ) {
|
||||
alertDialogBuilder.setTitle("Ticket is valid")
|
||||
} else if ( status == "ticketInvalid" ) {
|
||||
alertDialogBuilder.setTitle("Ticket is invalid")
|
||||
} else if ( status == "Error" ) {
|
||||
alertDialogBuilder.setTitle("There was an error connecting")
|
||||
alertDialogBuilder.setMessage("Please log out and log in again")
|
||||
when (status) {
|
||||
"ticketValid" -> {
|
||||
alertDialogBuilder.setTitle("Ticket is valid")
|
||||
}
|
||||
"ticketInvalid" -> {
|
||||
alertDialogBuilder.setTitle("Ticket is invalid")
|
||||
}
|
||||
"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)
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
<resources>
|
||||
<string name="app_name">libreevent entry control</string>
|
||||
<string name="log_out">Log out</string>
|
||||
</resources>
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
|
||||
773
src/server/package-lock.json
generated
773
src/server/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "libreevent",
|
||||
"version": "1.1.14",
|
||||
"version": "1.1.15",
|
||||
"description": "Free & Open source event management solution",
|
||||
"main": "index.js",
|
||||
"directories": {
|
||||
@@ -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",
|
||||
@@ -17,7 +17,7 @@
|
||||
"html-to-text": "^9.0.5",
|
||||
"multer": "^2.0.0",
|
||||
"mysql": "^2.18.1",
|
||||
"nodemailer": "^6.10.1",
|
||||
"nodemailer": "^7.0.10",
|
||||
"pdf-lib": "^1.17.1",
|
||||
"png-to-ico": "^2.1.8",
|
||||
"qs": "^6.14.0",
|
||||
|
||||
1335
src/webapp/main/package-lock.json
generated
1335
src/webapp/main/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "libreevent",
|
||||
"version": "1.1.14",
|
||||
"version": "1.1.15",
|
||||
"private": false,
|
||||
"scripts": {
|
||||
"dev": "vite --host",
|
||||
|
||||
26
src/webapp/setup/package-lock.json
generated
26
src/webapp/setup/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "libreevent-setup",
|
||||
"version": "1.1.14",
|
||||
"version": "1.1.15",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "libreevent-setup",
|
||||
"version": "1.1.14",
|
||||
"version": "1.1.15",
|
||||
"dependencies": {
|
||||
"pinia": "^2.1.3",
|
||||
"vue": "^3.3.4",
|
||||
@@ -1672,10 +1672,11 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/js-yaml": {
|
||||
"version": "4.1.0",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
||||
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
|
||||
"version": "4.1.1",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
|
||||
"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"argparse": "^2.0.1"
|
||||
},
|
||||
@@ -1724,10 +1725,11 @@
|
||||
}
|
||||
},
|
||||
"node_modules/lodash": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
||||
"dev": true
|
||||
"version": "4.17.23",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
|
||||
"integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lodash.merge": {
|
||||
"version": "4.6.2",
|
||||
@@ -2295,9 +2297,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/vite": {
|
||||
"version": "6.3.6",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
|
||||
"integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
|
||||
"version": "6.4.1",
|
||||
"resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
|
||||
"integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "libreevent-setup",
|
||||
"version": "1.1.14",
|
||||
"version": "1.1.15",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
Reference in New Issue
Block a user