Merge pull request 'Update Node.js to v22' (#125) from renovate/node-22.x into main

Reviewed-on: #125

.drone.yml

@@ -12,12 +12,12 @@ trigger:
 
 steps:
   - name: lint
-    image: node:18
+    image: node:22.11.0@sha256:f496dba5f685ef33797ed5882b4ce209053db67f88b50c1484ecccba6531bfde
     commands:
       - npm install
       - npm run lint
   - name: build
-    image: node:18
+    image: node:22.11.0@sha256:f496dba5f685ef33797ed5882b4ce209053db67f88b50c1484ecccba6531bfde
     environment:
       NODE_OPTIONS: '--openssl-legacy-provider'
     commands:
@@ -39,14 +39,14 @@ depends_on:
 
 steps:
   - name: build
-    image: node:18
+    image: node:22.11.0@sha256:f496dba5f685ef33797ed5882b4ce209053db67f88b50c1484ecccba6531bfde
     environment:
       NODE_OPTIONS: '--openssl-legacy-provider'
     commands:
       - npm install
       - npm run build
   - name: deploy
-    image: drillster/drone-rsync
+    image: drillster/drone-rsync@sha256:f4f90f96d0714d26c93c6c4c8f99bc4a7aa1cbf4d7bb772fcfac2ec7be44a331
     settings:
       hosts: [ "www.wtf-eg.net" ]
       user: onboarding
@@ -55,8 +55,4 @@ steps:
       source: ./dist/
       target: /srv/www/onboarding.wtf-eg.de/
       recursive: true
----
-kind: signature
-hmac: 0f87c59a97ed13bfd04074b63d1e5567b2ff228141951e7edb14ba31a123284e
 
-...

.eslintrc.js

@@ -8,7 +8,7 @@ module.exports = {
     '@vue/standard'
   ],
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: '@babel/eslint-parser'
   },
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',

package.json

@@ -8,25 +8,24 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "bootstrap": "^5.2.3",
+    "bootstrap": "5.3.3",
-    "core-js": "^3.26.1",
+    "core-js": "3.39.0",
-    "qrcode.vue": "^3.3.3",
+    "qrcode.vue": "3.6.0",
-    "register-service-worker": "^1.7.2",
+    "register-service-worker": "1.7.2",
-    "vue": "^3.0.0"
+    "vue": "3.5.12"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
+    "@babel/eslint-parser": "7.25.9",
-    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-plugin-babel": "5.0.8",
-    "@vue/cli-plugin-pwa": "~4.5.0",
+    "@vue/cli-plugin-eslint": "5.0.8",
-    "@vue/cli-service": "~4.5.0",
+    "@vue/cli-plugin-pwa": "5.0.8",
-    "@vue/compiler-sfc": "^3.0.0",
+    "@vue/cli-service": "5.0.8",
-    "@vue/eslint-config-standard": "^5.1.2",
+    "@vue/compiler-sfc": "3.5.12",
-    "babel-eslint": "^10.1.0",
+    "@vue/eslint-config-standard": "8.0.1",
-    "eslint": "^6.8.0",
+    "eslint": "8.57.1",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-n": "17.12.0",
-    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-promise": "7.1.0",
-    "eslint-plugin-standard": "^4.1.0",
+    "eslint-plugin-vue": "9.30.0"
-    "eslint-plugin-vue": "^7.20.0"
   }
 }

renovate.json

@@ -0,0 +1,18 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:best-practices",
+    "npm:unpublishSafe",
+    ":maintainLockFilesWeekly",
+    ":pinAllExceptPeerDependencies",
+    ":prHourlyLimitNone",
+    ":prConcurrentLimitNone",
+    ":separateMultipleMajorReleases"
+  ],
+  "packageRules": [
+    {
+      "matchFileNames": [".drone.yml"],
+      "schedule": ["before 9am on the first day of the month"]
+    }
+  ]
+}

src/App.vue

@@ -6,7 +6,7 @@
         <h1>Beitritts-/ Beteiligungserklärung zur WTF Kooperative eG</h1>
         WTF Kooperative eG, Hinterhaus 3. OG, Forsmannstr. 14 b, 22303 Hamburg<br/>
         <span class="fw-bold">Registergericht:</span> Hamburg GnR 1113<br/>
-        <span class="fw-bold">Vorstand:</span> Andreas Bogk, Frank Landgraf<br/>
+        <span class="fw-bold">Vorstand:</span> Frank Landgraf, Frank Lanitz<br/>
         <span class="fw-bold">Aufsichtsratsvorsitz:</span> Simon Liebing
         <p>
           <a href="https://dejure.org/gesetze/GenG">(§§ 15, 15a und 15b GenG)</a
@@ -30,6 +30,9 @@
       </div>
     </div>
 
+    <p class="no-print alert alert-danger">
+      Derzeit nehmen wir keine neuen Mitglieder auf.
+    </p>
     <p class="no-print">
       Bitte fülle alle Felder aus und klicke dann auf "Drucken". Das gedruckte
       Dokument muss dann noch mit Ort, Datum und Unterschrift versehen werden.
@@ -65,6 +68,7 @@
             Bankverbindung:
           </label>
           <table class="table table-striped mt-2">
+            <tbody>
             <tr class="no-print">
               <td>Kontoinhaberin:</td>
               <td>WTF Kooperative eG</td>
@@ -81,6 +85,7 @@
               <td>BIC:</td>
               <td> GENO DE M1 NRD</td>
             </tr>
+            </tbody>
           </table>
           <input
             class="form-check-input"
@@ -429,7 +434,7 @@
           </div>
         </div>
         <div>
-          <label for="pgp" class="form-label">PGP:*</label>
+          <label for="pgp" class="form-label">PGP-Fingerprint:*</label>
           <input
             type="text"
             class="form-control"
@@ -671,7 +676,7 @@ import QrcodeVue from 'qrcode.vue'
 import iso3166Import from '@/assets/iso3166.json'
 
 // Internal Component
-import Faq from '@/components/faq'
+import Faq from '@/components/TheFaq.vue'
 
 export default {
   name: "App",
@@ -681,7 +686,7 @@ export default {
   },
   data() {
     return {
-      version: "2024-04-05",
+      version: "2024-05-29",
       confirm_membership: false,
       direct_debit: false,
       membership_type_options: [
@@ -798,7 +803,7 @@ export default {
 
 @font-face {
   font-family: "Lato";
-  src: local('Lato'), url("/fonts/Lato-Regular.woff") format("woff"), url("/fonts/Lato-Regular.woff2") format("woff2");
+  src: local('Lato'), url("../public/fonts/Lato-Regular.woff") format("woff"), url("../public/fonts/Lato-Regular.woff2") format("woff2");
 }
 body{
   font-family: 'Lato', 'sans-serif' !important;

src/components/TheFaq.vue

@@ -43,6 +43,6 @@
 
 <script>
 export default {
-  name: 'Faq'
+  name: 'TheFaq'
 }
 </script>

src/registerServiceWorker.js

@@ -1,32 +1,5 @@
-/* eslint-disable no-console */
+import { unregister } from 'register-service-worker'
-
-import { register } from 'register-service-worker'
 
 if (process.env.NODE_ENV === 'production') {
-  register(`${process.env.BASE_URL}service-worker.js`, {
+  unregister()
-    ready () {
-      console.log(
-        'App is being served from cache by a service worker.\n' +
-        'For more details, visit https://goo.gl/AFskqB'
-      )
-    },
-    registered () {
-      console.log('Service worker has been registered.')
-    },
-    cached () {
-      console.log('Content has been cached for offline use.')
-    },
-    updatefound () {
-      console.log('New content is downloading.')
-    },
-    updated () {
-      console.log('New content is available; please refresh.')
-    },
-    offline () {
-      console.log('No internet connection found. App is running in offline mode.')
-    },
-    error (error) {
-      console.error('Error during service worker registration:', error)
-    }
-  })
 }