diff --git a/.env.example b/.env.example index 4de72c4..f7e858f 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1 @@ -VITE_SERVER_ADDRESS = backend_url #ohne pfad -VITE_APP_NAME_OVERWRITE = Mitgliederverwaltung # overwrites FF Admin -VITE_IMPRINT_LINK = https://mywebsite-imprint-url -VITE_PRIVACY_LINK = https://mywebsite-privacy-url -VITE_CUSTOM_LOGIN_MESSAGE = betrieben von xy +VITE_SERVER_ADDRESS = backend_url #ohne pfad \ No newline at end of file diff --git a/.env.production b/.env.production index 6696bbd..27c9fc3 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1 @@ -VITE_SERVER_ADDRESS = __SERVERADDRESS__ -VITE_APP_NAME_OVERWRITE = __APPNAMEOVERWRITE__ -VITE_IMPRINT_LINK = __IMPRINTLINK__ -VITE_PRIVACY_LINK = __PRIVACYLINK__ -VITE_CUSTOM_LOGIN_MESSAGE = __CUSTOMLOGINMESSAGE__ \ No newline at end of file +VITE_SERVER_ADDRESS = __SERVERADDRESS__ \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index 87660c6..75edc0b 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/sh -keys="SERVERADDRESS APPNAMEOVERWRITE IMPRINTLINK PRIVACYLINK CUSTOMLOGINMESSAGE" -files="/usr/share/nginx/html/assets/config-*.js /usr/share/nginx/html/manifest.webmanifest" +keys="SERVERADDRESS" +files="/usr/share/nginx/html/assets/config-*.js" # Replace env vars in files served by NGINX for file in $files @@ -12,11 +12,6 @@ do # Get environment variable value=$(eval echo "\$$key") - # Set default value for APPNAMEOVERWRITE if empty - if [ "$key" = "APPNAMEOVERWRITE" ] && [ -z "$value" ]; then - value="FF Admin" - fi - echo "replace $key by $value" # replace __[variable_name]__ value with environment variable diff --git a/index.html b/index.html index 35046b4..1d1d2bb 100644 --- a/index.html +++ b/index.html @@ -2,11 +2,14 @@ - - + +
+ diff --git a/package-lock.json b/package-lock.json index 7c33dbf..0c6c56a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,6 +35,7 @@ "nprogress": "^0.2.0", "pdf-dist": "^1.0.0", "pinia": "^3.0.2", + "pwacompat": "^2.0.17", "qrcode": "^1.5.3", "qs": "^6.11.2", "socket.io-client": "^4.5.0", @@ -8752,6 +8753,12 @@ "node": ">=6" } }, + "node_modules/pwacompat": { + "version": "2.0.17", + "resolved": "https://registry.npmjs.org/pwacompat/-/pwacompat-2.0.17.tgz", + "integrity": "sha512-6Du7IZdIy7cHiv7AhtDy4X2QRM8IAD5DII69mt5qWibC2d15ZU8DmBG1WdZKekG11cChSu4zkSUGPF9sweOl6w==", + "license": "Apache-2.0" + }, "node_modules/qrcode": { "version": "1.5.4", "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz", diff --git a/package.json b/package.json index cf05645..73f97b9 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "nprogress": "^0.2.0", "pdf-dist": "^1.0.0", "pinia": "^3.0.2", + "pwacompat": "^2.0.17", "qrcode": "^1.5.3", "qs": "^6.11.2", "socket.io-client": "^4.5.0", diff --git a/public/Logo.png b/public/Logo.png deleted file mode 100644 index a2760bc..0000000 Binary files a/public/Logo.png and /dev/null differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index 2f7aa89..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/favicon.png b/public/favicon.png deleted file mode 100644 index 39a8174..0000000 Binary files a/public/favicon.png and /dev/null differ diff --git a/src/App.vue b/src/App.vue index 385415e..e818e36 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,6 +8,11 @@