34 Commits

Author SHA1 Message Date
janis
5a5407920b update to V1.0.3 2024-03-07 16:13:41 +01:00
45a38cb36b update nodemailer because security 2024-03-05 17:01:41 +01:00
Janis Hutz
961fa5fc80 Update README.md 2024-01-29 19:31:51 +01:00
Janis Hutz
09633132e0 Update README.md 2024-01-29 19:30:13 +01:00
c3e1411bfe add version update stuff 2024-01-20 09:05:27 +01:00
Janis Hutz
35c4e89c9e Merge pull request #10 from simplePCBuilding/dependabot/npm_and_yarn/src/webapp/setup/vite-4.5.2 2024-01-20 08:56:28 +01:00
Janis Hutz
359fca424c Merge pull request #9 from simplePCBuilding/dependabot/npm_and_yarn/src/webapp/main/vite-2.9.17 2024-01-20 08:56:21 +01:00
dependabot[bot]
6846c187c3 Bump vite from 4.4.12 to 4.5.2 in /src/webapp/setup
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.12 to 4.5.2.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-20 02:23:47 +00:00
dependabot[bot]
0b0ddda4b9 Bump vite from 2.9.16 to 2.9.17 in /src/webapp/main
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 2.9.16 to 2.9.17.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v2.9.17/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v2.9.17/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-19 22:55:39 +00:00
Janis Hutz
0f5c652bd4 Merge pull request #8 from simplePCBuilding/dependabot/npm_and_yarn/src/server/follow-redirects-1.15.4 2024-01-12 11:01:02 +01:00
dependabot[bot]
7b31b209e7 Bump follow-redirects from 1.15.2 to 1.15.4 in /src/server
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-10 22:33:09 +00:00
Janis Hutz
7243592d03 Merge pull request #7 from simplePCBuilding/dependabot/npm_and_yarn/src/webapp/setup/vite-4.4.12 2023-12-08 09:28:07 +00:00
dependabot[bot]
92d6065e01 Bump vite from 4.4.4 to 4.4.12 in /src/webapp/setup
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.4 to 4.4.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.4.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.4.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-06 00:12:37 +00:00
3916aefe6b add launch trailer thumbnail 2023-11-29 21:00:19 +01:00
Janis Hutz
3ec9788163 Merge pull request #6 from simplePCBuilding/dependabot/npm_and_yarn/src/server/axios-1.6.0
Bump axios from 1.4.0 to 1.6.0 in /src/server
2023-11-12 12:34:32 +00:00
ddfb2ed5b9 small change 2023-11-12 12:33:40 +01:00
6a181b0139 finish version bump 2023-11-12 12:27:52 +01:00
bf24533cdd bump version number 2023-11-12 12:12:20 +01:00
0d8f3d3e0a small setup patches (spelling mistakes) 2023-11-12 12:09:27 +01:00
f6e4d3f8e3 add missing file 2023-11-12 11:07:58 +01:00
dependabot[bot]
4e46f2dc3a Bump axios from 1.4.0 to 1.6.0 in /src/server
Bumps [axios](https://github.com/axios/axios) from 1.4.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.4.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-11 14:28:52 +00:00
Janis Hutz
acae6ba9c0 Update README.md 2023-11-06 09:59:04 +01:00
Janis Hutz
1aafb0550a Merge pull request #4 from simplePCBuilding/dependabot/npm_and_yarn/src/webapp/setup/postcss-8.4.31
Bump postcss from 8.4.26 to 8.4.31 in /src/webapp/setup
2023-11-06 09:57:10 +01:00
Janis Hutz
811ab2727b Merge pull request #5 from simplePCBuilding/dependabot/npm_and_yarn/src/server/crypto-js-4.2.0
Bump crypto-js from 4.1.1 to 4.2.0 in /src/server
2023-11-06 09:54:48 +01:00
dependabot[bot]
7d61d084f1 Bump crypto-js from 4.1.1 to 4.2.0 in /src/server
Bumps [crypto-js](https://github.com/brix/crypto-js) from 4.1.1 to 4.2.0.
- [Commits](https://github.com/brix/crypto-js/compare/4.1.1...4.2.0)

---
updated-dependencies:
- dependency-name: crypto-js
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-06 08:53:07 +00:00
dependabot[bot]
160eaaa0ce Bump postcss from 8.4.26 to 8.4.31 in /src/webapp/setup
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.26 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.26...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-06 08:52:54 +00:00
Janis Hutz
5ee5c3695d Create dependabot.yml 2023-11-06 09:51:24 +01:00
Janis Hutz
77de93f9c3 Merge pull request #3 from simplePCBuilding/simplePCBuilding-patch-1
Create SECURITY.md
2023-11-06 09:48:49 +01:00
Janis Hutz
cc4efce26d Create SECURITY.md 2023-11-06 09:48:00 +01:00
Janis Hutz
5fef565e4b Update notes.md 2023-10-31 07:36:07 +00:00
Janis Hutz
d683f4a520 Update notes.md 2023-10-31 07:35:41 +00:00
Janis Hutz
7ce024a768 Update notes.md
Add links to apps to add to website
2023-10-27 08:49:05 +00:00
0d8915930c fix backdrop of highlighting on website 2023-10-25 19:30:29 +02:00
d9ca5bd7fc fix small spelling mistake on website 2023-10-25 19:17:34 +02:00
24 changed files with 124 additions and 68 deletions

11
.github/dependabot.yml vendored Normal file
View File

@@ -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"

View File

@@ -39,6 +39,9 @@ Alternatively, you may download the project directly from GitHub (by cloning it
- any CPU from the last 10 years - any CPU from the last 10 years
- Any operating system that can run node.js - 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 # 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). 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 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). 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).

13
SECURITY.md Normal file
View File

@@ -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)

Binary file not shown.

After

Width:  |  Height:  |  Size: 355 KiB

Binary file not shown.

View File

@@ -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]-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]-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) - 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 # PLANS
- Website: Add ids to titles - 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: Implement Permission system
- FUTURE: Add Admin profile (page to change account settings per person like changing pwd) - FUTURE: Add Admin profile (page to change account settings per person like changing pwd)
- FUTURE: add multi-language support - FUTURE: add multi-language support

13
package-lock.json generated Normal file
View File

@@ -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"
}
}
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,21 +1,21 @@
{ {
"name": "libreevent", "name": "libreevent",
"version": "1.0.0", "version": "1.0.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "libreevent", "name": "libreevent",
"version": "1.0.0", "version": "1.0.2",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"dependencies": { "dependencies": {
"@pdfme/generator": "^1.2.6", "@pdfme/generator": "^1.2.6",
"@seald-io/nedb": "^4.0.2", "@seald-io/nedb": "^4.0.2",
"axios": "^1.4.0", "axios": "^1.6.0",
"bcrypt": "^5.0.1", "bcrypt": "^5.0.1",
"body-parser": "^1.20.2", "body-parser": "^1.20.2",
"cookie-parser": "^1.4.6", "cookie-parser": "^1.4.6",
"crypto-js": "^4.1.1", "crypto-js": "^4.2.0",
"express": "^4.18.2", "express": "^4.18.2",
"express-session": "^1.17.3", "express-session": "^1.17.3",
"html-to-text": "^9.0.5", "html-to-text": "^9.0.5",
@@ -464,11 +464,11 @@
} }
}, },
"node_modules/axios": { "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": { "dependencies": {
"follow-redirects": "^1.15.0", "follow-redirects": "^1.15.4",
"form-data": "^4.0.0", "form-data": "^4.0.0",
"proxy-from-env": "^1.1.0" "proxy-from-env": "^1.1.0"
} }
@@ -819,9 +819,9 @@
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
}, },
"node_modules/crypto-js": { "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": { "node_modules/css-b64-images": {
"version": "0.2.5", "version": "0.2.5",
@@ -1234,9 +1234,9 @@
} }
}, },
"node_modules/follow-redirects": { "node_modules/follow-redirects": {
"version": "1.15.2", "version": "1.15.5",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@@ -2026,9 +2026,9 @@
} }
}, },
"node_modules/nodemailer": { "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": { "engines": {
"node": ">=6.0.0" "node": ">=6.0.0"
} }

View File

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

View File

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

View File

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

View File

@@ -1,12 +1,12 @@
{ {
"name": "libreevent", "name": "libreevent",
"version": "1.0.0", "version": "1.0.2",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "libreevent", "name": "libreevent",
"version": "1.0.0", "version": "1.0.2",
"dependencies": { "dependencies": {
"@pdfme/generator": "^1.2.3", "@pdfme/generator": "^1.2.3",
"@pdfme/ui": "^1.2.3", "@pdfme/ui": "^1.2.3",
@@ -20,7 +20,7 @@
"@vitejs/plugin-vue": "^1.10.2", "@vitejs/plugin-vue": "^1.10.2",
"eslint": "^8.39.0", "eslint": "^8.39.0",
"eslint-plugin-vue": "^9.17.0", "eslint-plugin-vue": "^9.17.0",
"vite": "^2.5.4" "vite": "^2.9.17"
} }
}, },
"node_modules/@aashutoshrathi/word-wrap": { "node_modules/@aashutoshrathi/word-wrap": {
@@ -2468,9 +2468,9 @@
"dev": true "dev": true
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "2.9.16", "version": "2.9.17",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.9.16.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.17.tgz",
"integrity": "sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==", "integrity": "sha512-XxcRzra6d7xrKXH66jZUgb+srThoPu+TLJc06GifUyKq9JmjHkc1Numc8ra0h56rju2jfVWw3B3fs5l3OFMvUw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"esbuild": "^0.14.27", "esbuild": "^0.14.27",
@@ -4381,9 +4381,9 @@
"dev": true "dev": true
}, },
"vite": { "vite": {
"version": "2.9.16", "version": "2.9.17",
"resolved": "https://registry.npmjs.org/vite/-/vite-2.9.16.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.17.tgz",
"integrity": "sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==", "integrity": "sha512-XxcRzra6d7xrKXH66jZUgb+srThoPu+TLJc06GifUyKq9JmjHkc1Numc8ra0h56rju2jfVWw3B3fs5l3OFMvUw==",
"dev": true, "dev": true,
"requires": { "requires": {
"esbuild": "^0.14.27", "esbuild": "^0.14.27",

View File

@@ -1,6 +1,6 @@
{ {
"name": "libreevent", "name": "libreevent",
"version": "1.0.0", "version": "1.0.2",
"private": false, "private": false,
"scripts": { "scripts": {
"dev": "vite --host", "dev": "vite --host",
@@ -19,7 +19,7 @@
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "^1.10.2", "@vitejs/plugin-vue": "^1.10.2",
"vite": "^2.5.4", "vite": "^2.9.17",
"eslint": "^8.39.0", "eslint": "^8.39.0",
"eslint-plugin-vue": "^9.17.0" "eslint-plugin-vue": "^9.17.0"
} }

View File

@@ -1,12 +1,12 @@
{ {
"name": "libreevent-setup", "name": "libreevent-setup",
"version": "0.0.0", "version": "1.0.2",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "libreevent-setup", "name": "libreevent-setup",
"version": "0.0.0", "version": "1.0.2",
"dependencies": { "dependencies": {
"pinia": "^2.1.3", "pinia": "^2.1.3",
"vue": "^3.3.4", "vue": "^3.3.4",
@@ -16,7 +16,7 @@
"@vitejs/plugin-vue": "^4.2.3", "@vitejs/plugin-vue": "^4.2.3",
"eslint": "^8.39.0", "eslint": "^8.39.0",
"eslint-plugin-vue": "^9.11.0", "eslint-plugin-vue": "^9.11.0",
"vite": "^4.3.9" "vite": "^4.5.2"
} }
}, },
"node_modules/@aashutoshrathi/word-wrap": { "node_modules/@aashutoshrathi/word-wrap": {
@@ -1141,9 +1141,9 @@
"dev": true "dev": true
}, },
"node_modules/fsevents": { "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, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"optional": true, "optional": true,
@@ -1593,9 +1593,9 @@
} }
}, },
"node_modules/postcss": { "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": [ "funding": [
{ {
"type": "opencollective", "type": "opencollective",
@@ -1705,9 +1705,9 @@
} }
}, },
"node_modules/rollup": { "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, "dev": true,
"bin": { "bin": {
"rollup": "dist/bin/rollup" "rollup": "dist/bin/rollup"
@@ -1869,14 +1869,14 @@
"dev": true "dev": true
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "4.4.4", "version": "4.5.2",
"resolved": "https://registry.npmjs.org/vite/-/vite-4.4.4.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
"integrity": "sha512-4mvsTxjkveWrKDJI70QmelfVqTm+ihFAb6+xf4sjEU2TmUCTlVX87tmg/QooPEMQb/lM9qGHT99ebqPziEd3wg==", "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"esbuild": "^0.18.10", "esbuild": "^0.18.10",
"postcss": "^8.4.25", "postcss": "^8.4.27",
"rollup": "^3.25.2" "rollup": "^3.27.1"
}, },
"bin": { "bin": {
"vite": "bin/vite.js" "vite": "bin/vite.js"

View File

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

View File

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

View File

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

View File

@@ -33,7 +33,7 @@
<h1>Thank you for downloading <i>libre</i>ǝvent</h1> <h1>Thank you for downloading <i>libre</i>ǝvent</h1>
</div> </div>
<div class="content"> <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> <h3>Where to go from here?</h3>
<ul> <ul>
<li>Deploy libreevent on a webserver: <a href="/docs/setup/installation">Guide</a></li> <li>Deploy libreevent on a webserver: <a href="/docs/setup/installation">Guide</a></li>

View File

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