Merge pull request #19 from simplePCBuilding/dependabot/npm_and_yarn/src/webapp/main/multi-aecc66a090

Bumps [pdfjs-dist](https://github.com/mozilla/pdfjs-dist) to 4.2.67 and updates ancestor dependency [@pdfme/ui](https://github.com/pdfme/pdfme). These dependencies need to be updated together.


Updates `pdfjs-dist` from 2.12.313 to 4.2.67
- [Commits](https://github.com/mozilla/pdfjs-dist/commits)

Updates `@pdfme/ui` from 1.2.3 to 3.2.1
- [Release notes](https://github.com/pdfme/pdfme/releases)
- [Changelog](https://github.com/pdfme/pdfme/blob/main/RELEASE.md)
- [Commits](https://github.com/pdfme/pdfme/compare/1.2.3...3.2.1)

---
updated-dependencies:
- dependency-name: pdfjs-dist
  dependency-type: indirect
- dependency-name: "@pdfme/ui"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

README.md

@@ -39,6 +39,9 @@ Alternatively, you may download the project directly from GitHub (by cloning it
 - any CPU from the last 10 years
 - Any operating system that can run node.js
 
+# Roadmap
+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. 
 
@@ -60,6 +63,6 @@ If you like this project and it helped you save money, please consider donating
 
 You may notice some additional folders appearing after running 
 ```
-npm run package
+./package.sh
 ```
 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).

SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+libreevent gets security updates as part of regular software updates. Since there is only one major version currently, only this one gets updates
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 1.0.x   | :white_check_mark: |
+| 0.x.x   | :x:                |
+
+## Reporting a Vulnerability
+Please open an issue if you have discovered a security problem or send a mail to [development@janishutz.com](mailto:development@janishutz.com)

notes.md

@@ -3,17 +3,17 @@ For deployment create the following items:
 - libreevent-[VERSION HERE]-npm.zip (contains the node_modules folder from src/server)
 - libreevent-[VERSION HERE]-prebuilt.zip (contains a ready-to-use compiled version of libreevent (main download))
 - libreevent-[VERSION HERE]-full-icu.zip (contains the package.json file which can be used if full-icu is not enabled in Node.js)
+-> This can be achieved by running the bash script `package.sh` in the root folder of the project
 
 
+# Links to apps
+- https://play.google.com/store/apps/details?id=com.janishutz.libreevent
+- https://apps.apple.com/ch/app/libreevent-entry-control/id6464594870?l=en-GB
+
 
 # PLANS
 - Website: Add ids to titles
 
-
-- Update files to import when deploying for included json files instead of secret.json files
-- Also remove /test/ routes
-
-
 - FUTURE: Implement Permission system
 - FUTURE: Add Admin profile (page to change account settings per person like changing pwd)
 - FUTURE: add multi-language support

package-lock.json

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

package.sh

@@ -6,7 +6,7 @@
 #
 #
 
-v="V1.0.0"
+v="V1.0.4"
 
 echo "
  _ _ _                                   _   
@@ -36,6 +36,10 @@ sleep 0.5
 
 cd src/webapp/setup
 npm i
+npm audit fix
+
+sleep 1
+
 npm run build
 
 echo " 
@@ -50,6 +54,10 @@ cd ../main
 
 
 npm i
+npm audit fix
+
+sleep 1
+
 npm run build
 
 echo " 
@@ -120,6 +128,11 @@ sleep 1
 
 cd src/server
 npm i
+
+npm audit fix
+
+sleep 1
+
 cd ../../
 zip -9r libreevent-$v-npm.zip src/server/node_modules
 

src/server/app.js

@@ -76,7 +76,7 @@ app.use( expressSession( {
     saveUninitialized: true,
     cookie: {
         sameSite: 'none',
-        httpOnly: false,
+        httpOnly: true,
         secure: false,
     }
 } ) );

src/server/backend/plugins/others/poll/data/voteUIDReferencing.json

@@ -0,0 +1 @@
+{}

src/server/config/settings.config.json

@@ -13,5 +13,5 @@
 	"gcInterval":300,
 	"ticketTimeout":900,
 	"startPage":"default",
-	"version":"1.0.0"
+	"version":"1.0.1"
 }

src/server/package-lock.json

@@ -1,22 +1,22 @@
 {
   "name": "libreevent",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "libreevent",
-      "version": "1.0.0",
+      "version": "1.0.2",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@pdfme/generator": "^1.2.6",
         "@seald-io/nedb": "^4.0.2",
-        "axios": "^1.4.0",
+        "axios": "^1.6.0",
         "bcrypt": "^5.0.1",
         "body-parser": "^1.20.2",
         "cookie-parser": "^1.4.6",
-        "crypto-js": "^4.1.1",
+        "crypto-js": "^4.2.0",
-        "express": "^4.18.2",
+        "express": "^4.19.2",
         "express-session": "^1.17.3",
         "html-to-text": "^9.0.5",
         "multer": "^1.4.5-lts.1",
@@ -464,11 +464,11 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.4.0",
+      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
-      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
+      "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
       "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.4",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -819,9 +819,9 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
     },
     "node_modules/crypto-js": {
-      "version": "4.1.1",
+      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
+      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
     "node_modules/css-b64-images": {
       "version": "0.2.5",
@@ -1031,16 +1031,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
+      "version": "4.19.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -1110,33 +1110,10 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/express/node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.11.0",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
     "node_modules/express/node_modules/cookie": {
-      "version": "0.5.0",
+      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -1168,20 +1145,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/express/node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1234,9 +1197,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
+      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",
@@ -1851,9 +1814,9 @@
       }
     },
     "node_modules/minipass": {
-      "version": "4.2.8",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
       "engines": {
         "node": ">=8"
       }
@@ -2026,9 +1989,9 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "6.9.3",
+      "version": "6.9.11",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.3.tgz",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.11.tgz",
-      "integrity": "sha512-fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg==",
+      "integrity": "sha512-UiAkgiERuG94kl/3bKfE8o10epvDnl0vokNEtZDPTq9BWzIl6EFT9336SbIT4oaTBD8NmmUTLsQyXHV82eXSWg==",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -2686,13 +2649,13 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.1.13",
+      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
-        "minipass": "^4.0.0",
+        "minipass": "^5.0.0",
         "minizlib": "^2.1.1",
         "mkdirp": "^1.0.3",
         "yallist": "^4.0.0"

src/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreevent",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Free & Open source event management solution",
   "main": "app.js",
   "directories": {
@@ -44,12 +44,12 @@
   "dependencies": {
     "@pdfme/generator": "^1.2.6",
     "@seald-io/nedb": "^4.0.2",
-    "axios": "^1.4.0",
+    "axios": "^1.6.0",
     "bcrypt": "^5.0.1",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "express-session": "^1.17.3",
     "html-to-text": "^9.0.5",
     "multer": "^1.4.5-lts.1",

src/server/prepareDB.js

@@ -73,7 +73,7 @@ saveSettings( {
     'gcInterval': 300,
     'ticketTimeout': 900,
     'startPage': 'default',
-    'version': '1.0.0'
+    'version': '1.0.1'
 } );
 
 console.log( '  ==> Done!\n\n' );

src/server/setup/setupRoutes.js

@@ -54,6 +54,7 @@ module.exports = ( app, settings ) => {
             }
             let updatedSettings = settings;
             updatedSettings[ 'name' ] = req.body.websiteName;
+            updatedSettings[ 'yourDomain' ] = req.body.yourDomain;
             updatedSettings[ 'mailSender' ] = req.body.mailDisplay;
             db.saveSettings( updatedSettings );
             res.send( 'ok' );

src/webapp/main/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreevent",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "private": false,
   "scripts": {
     "dev": "vite --host",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@pdfme/generator": "^1.2.3",
-    "@pdfme/ui": "^1.2.3",
+    "@pdfme/ui": "^3.2.1",
     "pinia": "^2.0.34",
     "vue": "^3.2.13",
     "vue-picture-input": "^3.0.1",
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^1.10.2",
-    "vite": "^2.5.4",
+    "vite": "^2.9.18",
     "eslint": "^8.39.0",
     "eslint-plugin-vue": "^9.17.0"
   }

src/webapp/setup/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "libreevent-setup",
-  "version": "0.0.0",
+  "version": "1.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "libreevent-setup",
-      "version": "0.0.0",
+      "version": "1.0.2",
       "dependencies": {
         "pinia": "^2.1.3",
         "vue": "^3.3.4",
@@ -16,7 +16,7 @@
         "@vitejs/plugin-vue": "^4.2.3",
         "eslint": "^8.39.0",
         "eslint-plugin-vue": "^9.11.0",
-        "vite": "^4.3.9"
+        "vite": "^4.5.3"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -1141,9 +1141,9 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
+      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
       "optional": true,
@@ -1593,9 +1593,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.26",
+      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.26.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -1705,9 +1705,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.26.3",
+      "version": "3.29.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.26.3.tgz",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
-      "integrity": "sha512-7Tin0C8l86TkpcMtXvQu6saWH93nhG3dGQ1/+l5V2TDMceTxO7kDiK6GzbfLWNNxqJXm591PcEZUozZm51ogwQ==",
+      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1869,14 +1869,14 @@
       "dev": true
     },
     "node_modules/vite": {
-      "version": "4.4.4",
+      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.4.tgz",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
-      "integrity": "sha512-4mvsTxjkveWrKDJI70QmelfVqTm+ihFAb6+xf4sjEU2TmUCTlVX87tmg/QooPEMQb/lM9qGHT99ebqPziEd3wg==",
+      "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.18.10",
-        "postcss": "^8.4.25",
+        "postcss": "^8.4.27",
-        "rollup": "^3.25.2"
+        "rollup": "^3.27.1"
       },
       "bin": {
         "vite": "bin/vite.js"

src/webapp/setup/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreevent-setup",
-  "version": "0.0.0",
+  "version": "1.0.2",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -17,6 +17,6 @@
     "@vitejs/plugin-vue": "^4.2.3",
     "eslint": "^8.39.0",
     "eslint-plugin-vue": "^9.11.0",
-    "vite": "^4.3.9"
+    "vite": "^4.5.3"
   }
 }

src/webapp/setup/src/views/BasicSetupView.vue

@@ -17,6 +17,8 @@
             <h2>General information</h2>
             <label for="name">Name of the website</label><br>
             <input type="text" name="name" id="name" v-model="formData.websiteName"><br>
+            <label for="name">URL of the website</label><br>
+            <input type="text" name="domain" id="domain" v-model="formData.yourDomain"><br>
             
 
             <h2>Database</h2>
@@ -108,7 +110,6 @@ export default {
     },
     methods: {
         submit() {
-            this.collectUrl();
             if ( this.formData.dbType === 'mysql' ) {
                 if ( !this.formData.db.port || !this.formData.db.host || !this.formData.db.database || !this.formData.db.user || !this.formData.db.password ) {
                     this.$refs.notification.createNotification( 'Database settings are not complete!', 5, 'error', 'normal' );
@@ -149,7 +150,7 @@ export default {
             this.$router.push( '/setup/root' );
         },
         collectUrl() {
-            this.formData.yourDomain = location.protocol + '//' + location.host;
+            this.formData.yourDomain = location.protocol + '//' + location.host + ( location.port ? ':' + location.port : '' );
             this.formData.db.host = location.hostname;
         }
     },
@@ -157,6 +158,7 @@ export default {
         if ( sessionStorage.getItem( 'basics' ) ) {
             this.formData = JSON.parse( sessionStorage.getItem( 'basics' ) );
         }
+        this.collectUrl();
     }
 };
 </script>

src/webapp/setup/src/views/SetupRootView.vue

@@ -124,15 +124,14 @@ export default {
                             let requirementsCount = { 'special': 0, 'numbers': 0, 'lower': 0, 'upper': 0, 'incorrect': '' };
                             const pw = this.formData.password;
                             for ( let l in pw ) {
-                                console.log( pw[ l ] );
                                 if ( /[a-z]/.test( pw[ l ] ) ) {
                                     requirementsCount[ 'lower' ] += 1;
                                 } else if ( /[A-Z]/.test( pw[ l ] ) ) {
                                     requirementsCount[ 'upper' ] += 1;
                                 } else if ( lookup.includes( pw[ l ] ) ) {
                                     requirementsCount[ 'special' ] += 1;
-                                } else if ( !isNaN( pw[ l ] * 1 ) ) {
+                                } else if ( !isNaN( pw[ l ] ) ) {
-                                    requirementsCount[ 'number' ] += 1;
+                                    requirementsCount[ 'numbers' ] += 1;
                                 } else {
                                     console.log( 'incorrect letter' );
                                     requirementsCount[ 'incorrect' ] = pw[ l ];

website/dist/download/thanks/index.html

@@ -33,7 +33,7 @@
             <h1>Thank you for downloading <i>libre</i>ǝvent</h1>
         </div>
         <div class="content">
-            <p>If the download didn't start automatically, please click click <a href="https://github.com/simplePCBuilding/libreevent/releases/latest">here</a> and try from there</p>
+            <p>If the download didn't start automatically, please click <a href="https://github.com/simplePCBuilding/libreevent/releases/latest">here</a> and try from there</p>
             <h3>Where to go from here?</h3>
             <ul>
                 <li>Deploy libreevent on a webserver: <a href="/docs/setup/installation">Guide</a></li>

website/dist/templates/main.css

@@ -44,7 +44,7 @@
 }
 
 ::selection {
-    background-color: var( --highlight-backdrop );
+    background-color: #7c8cec;
     color: var( --secondary-color );
 }