Merge pull request 'Lock file maintenance' (#158) from renovate/lock-file-maintenance into main

Reviewed-on: #158

.drone.yml

@@ -12,12 +12,12 @@ trigger:
 
 steps:
   - name: lint
-    image: node:18
+    image: node:22.12.0@sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc
     commands:
       - npm install
       - npm run lint
   - name: build
-    image: node:18
+    image: node:22.12.0@sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc
     environment:
       NODE_OPTIONS: '--openssl-legacy-provider'
     commands:
@@ -39,14 +39,14 @@ depends_on:
 
 steps:
   - name: build
-    image: node:18
+    image: node:22.12.0@sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc
     environment:
       NODE_OPTIONS: '--openssl-legacy-provider'
     commands:
       - npm install
       - npm run build
   - name: deploy
-    image: drillster/drone-rsync
+    image: drillster/drone-rsync@sha256:8f850004f5bf9b3bcb5ce360876a9786f67d3a1f18861084f4252d3d4c5ee3b5
     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.40.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.13"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.5.0",
+    "@babel/eslint-parser": "7.26.5",
-    "@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.13",
-    "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.15.1",
-    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-promise": "7.2.1",
-    "eslint-plugin-standard": "^4.1.0",
+    "eslint-plugin-vue": "9.32.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

@@ -2,12 +2,12 @@
   <header class="container">
     <div class="row">
       <div class="col-6">
-        <img src="/img/wtf_logo.svg" style="height: 7rem" />
+        <img src="/img/wtf_logo.svg" style="height: 7rem"  alt="Logo der WTF Kooperative eG"/>
         <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> Markus Klein, Frank Landgraf<br/>
+        <span class="fw-bold">Vorstand:</span> Frank Landgraf, Frank Lanitz<br/>
-        <span class="fw-bold">Aufsichtsratsvorsitz:</span> Alexander Heidenreich
+        <span class="fw-bold">Aufsichtsratsvorsitz:</span> Simon Liebing
         <p>
           <a href="https://dejure.org/gesetze/GenG">(§§ 15, 15a und 15b GenG)</a
           >
@@ -53,7 +53,7 @@
             id="confirm_membership"
             required
           />
-          <label class="form-check-label beantraungs-text" for="flexCheckDefault">
+          <label class="form-check-label beantraungs-text" for="confirm_membership">
             Ich beantrage hiermit die Aufnahme in die WTF Kooperative eG,
             bestätige die mir zur Verfügung gestellte <a href="https://wtf-eg.de/dokumente/wtf-satzung.pdf">Satzung</a>
             und <a href="https://wtf-eg.de/dokumente/wtf-ago.pdf">Allgemeine Geschäftsordnung (AGO)</a>
@@ -61,26 +61,37 @@
             Höhe von 100 € je Geschäftsanteil, einer einmaligen Aufnahmegebühr
             von 100 €, sowie einem jährlichen Beitrag in Höhe von 100 €, selbst
             per Überweisung mit dem Verwendungszweck Mitgliedsnummer (wenn
-            vorhanden) bzw. Name, Vorname und Geburtsdatum an folgende
+            vorhanden) bzw. <code>Name - Vorname - Geburtsdatum</code> an folgende
             Bankverbindung:
-            <table class="table table-striped mt-2">
+          </label>
-              <tr class="no-print">
+          <table class="table table-striped mt-2">
-                <td>Kontoinhaberin:</td>
+            <tbody>
-                <td>WTF Kooperative eG</td>
+            <tr class="no-print">
-              </tr>
+              <td>Kontoinhaberin:</td>
-              <tr>
+              <td>WTF Kooperative eG</td>
-                <td>IBAN:</td>
+            </tr>
-                <td><strong>DE67 4476 1534 </strong>2301 4210 00</td>
+            <tr>
-              </tr>
+              <td>IBAN:</td>
-              <tr class="no-print">
+              <td><strong>DE67 4476 1534 </strong>2301 4210 00</td>
-                <td>Bank:</td>
+            </tr>
-                <td>Volksbank in Südwestfalen eG</td>
+            <tr class="no-print">
-              </tr>
+              <td>Bank:</td>
-              <tr class="no-print">
+              <td>Volksbank in Südwestfalen eG</td>
-                <td>BIC:</td>
+            </tr>
-                <td> GENO DE M1 NRD</td>
+            <tr class="no-print">
-              </tr>
+              <td>BIC:</td>
-            </table>
+              <td> GENO DE M1 NRD</td>
+            </tr>
+            </tbody>
+          </table>
+          <input
+            class="form-check-input"
+            type="checkbox"
+            v-model="direct_debit"
+            id="direct_debit"
+          />
+          <label for="direct_debit" class="form-check-label beantraungs-text">
+            Bei erfolgreicher Aufnahme möchte ich künftig meinen Jahresbeitrag per Lastschrift begleichen.
           </label>
         </div>
         <div class="row">
@@ -143,7 +154,7 @@
           </div>
           <div
             class="col-6 col-xs-12"
-            v-if="membership_type != membership_type_options[0]"
+            v-if="membership_type !== membership_type_options[0]"
           >
             <div class="mb-3">
               Gesamtanzahl Anteile:
@@ -194,7 +205,7 @@
           </div>
           <div
             class="col-4 col-xs-12"
-            v-if="membership_type != membership_type_options[0]"
+            v-if="membership_type !== membership_type_options[0]"
           >
             <label for="membership_number" class="form-label"
               >Deine Mitgliedsnummer: (sofern vorhanden)</label
@@ -420,7 +431,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"
@@ -435,8 +446,8 @@
           deine Interaktion mit der Genossenschaft. Bitte lade Deinen Public-Key
           entweder auf übliche Keyserver hoch oder sende ihn uns von genau der
           angegebenen Mailadresse als Mail-Anhang:
-          <a href="mailto:office@wtf-eg.de">office@wtf-eg.de</a>. (als Betreff
+          <a href="mailto:member@wtf-eg.de">member@wtf-eg.de</a>. (als Betreff
-          deinen Nick wie oben angegeben).
+          <code>{{ pubkeyEmailSubject }}</code> angegeben).
         </p>
         <p class="no-print">
           Wenn Du noch kein PGP-Key-Paar hast, musst Du Dir eines anlegen. Im
@@ -450,7 +461,7 @@
           <a href="https://mailbox.org/de/">mailbox.org</a>. Es ist gar nicht so
           schwer! :)
         </p>
-        <wrapper class="job_chaos">
+        <div class="job_chaos">
           <article class="job_situation">
             <h3>Berufliche Situation & Finanzen</h3>
             <label>Ich bin zur Zeit:</label>
@@ -586,7 +597,7 @@
               </label>
             </div>
           </article>
-        </wrapper>
+        </div>
         <hr class="no-print" />
         <p>
           Mit meiner Unterschrift bestätige ich, dass über mein Vermögen keine
@@ -662,7 +673,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",
@@ -672,8 +683,9 @@ export default {
   },
   data() {
     return {
-      version: "2022-11-22",
+      version: "2024-11-22",
       confirm_membership: false,
+      direct_debit: false,
       membership_type_options: [
         "Neues Mitglied",
         "Bestehendes Mitglied",
@@ -743,6 +755,7 @@ export default {
           pgp: this.pgp,
           chaos_connection: this.chaos_connection.substring(0,200),
           public_nick: this.public_nick.substring(0,100),
+          direct_debit: this.direct_debit,
         };
 
         if (this.status_1) membership.nicht_erwerbstaetig = true;
@@ -772,6 +785,9 @@ export default {
         return JSON.stringify(membership);
       },
     },
+    pubkeyEmailSubject() {
+      return `Aufnahmeantrag ${this.nickname ? this.nickname : '[dein Nickname]'}`
+    },
   },
   methods: {
     onSubmit() {
@@ -783,12 +799,11 @@ export default {
 <style >
 
 @font-face {
-font-family: "Lato";
+  font-family: "Lato";
-src: url("/fonts/Lato-Regular.eot");
+  src: local('Lato'), url("../public/fonts/Lato-Regular.woff") format("woff"), url("../public/fonts/Lato-Regular.woff2") format("woff2");
-src: url("/fonts/Lato-Regular.woff") format("woff"),
 }
 body{
-  font-family: 'Lato' !important;
+  font-family: 'Lato', 'sans-serif' !important;
 }
 h1 {
   font-size: 2rem !important;
@@ -808,8 +823,8 @@ h1 {
 @media print {
   .container{
     max-width: 100% !important;
-    margin-left: none !important;
+    margin-left: 0 !important;
-    margin-right: none !important;
+    margin-right: 0 !important;
   }
   .main-qr-code{
     height: 350px !important;
@@ -825,7 +840,7 @@ h1 {
     font-size: 1.1rem !important;
   }
   .mt-3{
-    margin-top: none !important;
+    margin-top: 0 !important;
   }
   input{
     font-size: 0.5rem;
@@ -846,7 +861,7 @@ h1 {
   }
   .chaos_connection,
   .job_situation {
-    flex: 1 0 0%;
+    flex: 1 0 0;
     padding: 15px;
   }
 

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