Compare commits
No commits in common. "main" and "add-ago" have entirely different histories.
12
.drone.yml
12
.drone.yml
@ -12,12 +12,12 @@ trigger:
|
||||
|
||||
steps:
|
||||
- name: lint
|
||||
image: node:22.12.0@sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc
|
||||
image: node:18
|
||||
commands:
|
||||
- npm install
|
||||
- npm run lint
|
||||
- name: build
|
||||
image: node:22.12.0@sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc
|
||||
image: node:18
|
||||
environment:
|
||||
NODE_OPTIONS: '--openssl-legacy-provider'
|
||||
commands:
|
||||
@ -39,14 +39,14 @@ depends_on:
|
||||
|
||||
steps:
|
||||
- name: build
|
||||
image: node:22.12.0@sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc
|
||||
image: node:18
|
||||
environment:
|
||||
NODE_OPTIONS: '--openssl-legacy-provider'
|
||||
commands:
|
||||
- npm install
|
||||
- npm run build
|
||||
- name: deploy
|
||||
image: drillster/drone-rsync@sha256:8f850004f5bf9b3bcb5ce360876a9786f67d3a1f18861084f4252d3d4c5ee3b5
|
||||
image: drillster/drone-rsync
|
||||
settings:
|
||||
hosts: [ "www.wtf-eg.net" ]
|
||||
user: onboarding
|
||||
@ -55,4 +55,8 @@ steps:
|
||||
source: ./dist/
|
||||
target: /srv/www/onboarding.wtf-eg.de/
|
||||
recursive: true
|
||||
---
|
||||
kind: signature
|
||||
hmac: 0f87c59a97ed13bfd04074b63d1e5567b2ff228141951e7edb14ba31a123284e
|
||||
|
||||
...
|
||||
|
||||
@ -8,7 +8,7 @@ module.exports = {
|
||||
'@vue/standard'
|
||||
],
|
||||
parserOptions: {
|
||||
parser: '@babel/eslint-parser'
|
||||
parser: 'babel-eslint'
|
||||
},
|
||||
rules: {
|
||||
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
|
||||
|
||||
31503
package-lock.json
generated
31503
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
35
package.json
35
package.json
@ -8,24 +8,25 @@
|
||||
"lint": "vue-cli-service lint"
|
||||
},
|
||||
"dependencies": {
|
||||
"bootstrap": "5.3.3",
|
||||
"core-js": "3.40.0",
|
||||
"qrcode.vue": "3.6.0",
|
||||
"register-service-worker": "1.7.2",
|
||||
"vue": "3.5.13"
|
||||
"bootstrap": "^5.2.3",
|
||||
"core-js": "^3.26.1",
|
||||
"qrcode.vue": "^3.3.3",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"vue": "^3.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/eslint-parser": "7.26.5",
|
||||
"@vue/cli-plugin-babel": "5.0.8",
|
||||
"@vue/cli-plugin-eslint": "5.0.8",
|
||||
"@vue/cli-plugin-pwa": "5.0.8",
|
||||
"@vue/cli-service": "5.0.8",
|
||||
"@vue/compiler-sfc": "3.5.13",
|
||||
"@vue/eslint-config-standard": "8.0.1",
|
||||
"eslint": "8.57.1",
|
||||
"eslint-plugin-import": "2.31.0",
|
||||
"eslint-plugin-n": "17.15.1",
|
||||
"eslint-plugin-promise": "7.2.1",
|
||||
"eslint-plugin-vue": "9.32.0"
|
||||
"@vue/cli-plugin-babel": "~4.5.0",
|
||||
"@vue/cli-plugin-eslint": "~4.5.0",
|
||||
"@vue/cli-plugin-pwa": "~4.5.0",
|
||||
"@vue/cli-service": "~4.5.0",
|
||||
"@vue/compiler-sfc": "^3.0.0",
|
||||
"@vue/eslint-config-standard": "^5.1.2",
|
||||
"babel-eslint": "^10.1.0",
|
||||
"eslint": "^6.8.0",
|
||||
"eslint-plugin-import": "^2.26.0",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-promise": "^4.3.1",
|
||||
"eslint-plugin-standard": "^4.1.0",
|
||||
"eslint-plugin-vue": "^7.20.0"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
{
|
||||
"$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"]
|
||||
}
|
||||
]
|
||||
}
|
||||
57
src/App.vue
57
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" alt="Logo der WTF Kooperative eG"/>
|
||||
<img src="/img/wtf_logo.svg" style="height: 7rem" />
|
||||
<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> Frank Landgraf, Frank Lanitz<br/>
|
||||
<span class="fw-bold">Aufsichtsratsvorsitz:</span> Simon Liebing
|
||||
<span class="fw-bold">Vorstand:</span> Markus Klein, Frank Landgraf<br/>
|
||||
<span class="fw-bold">Aufsichtsratsvorsitz:</span> Alexander Heidenreich
|
||||
<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="confirm_membership">
|
||||
<label class="form-check-label beantraungs-text" for="flexCheckDefault">
|
||||
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,11 +61,9 @@
|
||||
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. <code>Name - Vorname - Geburtsdatum</code> an folgende
|
||||
vorhanden) bzw. Name, Vorname und Geburtsdatum an folgende
|
||||
Bankverbindung:
|
||||
</label>
|
||||
<table class="table table-striped mt-2">
|
||||
<tbody>
|
||||
<tr class="no-print">
|
||||
<td>Kontoinhaberin:</td>
|
||||
<td>WTF Kooperative eG</td>
|
||||
@ -82,16 +80,7 @@
|
||||
<td>BIC:</td>
|
||||
<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">
|
||||
@ -154,7 +143,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:
|
||||
@ -205,7 +194,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
|
||||
@ -431,7 +420,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<label for="pgp" class="form-label">PGP-Fingerprint:*</label>
|
||||
<label for="pgp" class="form-label">PGP:*</label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
@ -446,8 +435,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:member@wtf-eg.de">member@wtf-eg.de</a>. (als Betreff
|
||||
<code>{{ pubkeyEmailSubject }}</code> angegeben).
|
||||
<a href="mailto:office@wtf-eg.de">office@wtf-eg.de</a>. (als Betreff
|
||||
deinen Nick wie oben angegeben).
|
||||
</p>
|
||||
<p class="no-print">
|
||||
Wenn Du noch kein PGP-Key-Paar hast, musst Du Dir eines anlegen. Im
|
||||
@ -461,7 +450,7 @@
|
||||
<a href="https://mailbox.org/de/">mailbox.org</a>. Es ist gar nicht so
|
||||
schwer! :)
|
||||
</p>
|
||||
<div class="job_chaos">
|
||||
<wrapper class="job_chaos">
|
||||
<article class="job_situation">
|
||||
<h3>Berufliche Situation & Finanzen</h3>
|
||||
<label>Ich bin zur Zeit:</label>
|
||||
@ -597,7 +586,7 @@
|
||||
</label>
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
</wrapper>
|
||||
<hr class="no-print" />
|
||||
<p>
|
||||
Mit meiner Unterschrift bestätige ich, dass über mein Vermögen keine
|
||||
@ -673,7 +662,7 @@ import QrcodeVue from 'qrcode.vue'
|
||||
import iso3166Import from '@/assets/iso3166.json'
|
||||
|
||||
// Internal Component
|
||||
import Faq from '@/components/TheFaq.vue'
|
||||
import Faq from '@/components/faq'
|
||||
|
||||
export default {
|
||||
name: "App",
|
||||
@ -683,9 +672,8 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
version: "2024-11-22",
|
||||
version: "2022-11-22",
|
||||
confirm_membership: false,
|
||||
direct_debit: false,
|
||||
membership_type_options: [
|
||||
"Neues Mitglied",
|
||||
"Bestehendes Mitglied",
|
||||
@ -755,7 +743,6 @@ 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;
|
||||
@ -785,9 +772,6 @@ export default {
|
||||
return JSON.stringify(membership);
|
||||
},
|
||||
},
|
||||
pubkeyEmailSubject() {
|
||||
return `Aufnahmeantrag ${this.nickname ? this.nickname : '[dein Nickname]'}`
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
onSubmit() {
|
||||
@ -800,10 +784,11 @@ export default {
|
||||
|
||||
@font-face {
|
||||
font-family: "Lato";
|
||||
src: local('Lato'), url("../public/fonts/Lato-Regular.woff") format("woff"), url("../public/fonts/Lato-Regular.woff2") format("woff2");
|
||||
src: url("/fonts/Lato-Regular.eot");
|
||||
src: url("/fonts/Lato-Regular.woff") format("woff"),
|
||||
}
|
||||
body{
|
||||
font-family: 'Lato', 'sans-serif' !important;
|
||||
font-family: 'Lato' !important;
|
||||
}
|
||||
h1 {
|
||||
font-size: 2rem !important;
|
||||
@ -823,8 +808,8 @@ h1 {
|
||||
@media print {
|
||||
.container{
|
||||
max-width: 100% !important;
|
||||
margin-left: 0 !important;
|
||||
margin-right: 0 !important;
|
||||
margin-left: none !important;
|
||||
margin-right: none !important;
|
||||
}
|
||||
.main-qr-code{
|
||||
height: 350px !important;
|
||||
@ -840,7 +825,7 @@ h1 {
|
||||
font-size: 1.1rem !important;
|
||||
}
|
||||
.mt-3{
|
||||
margin-top: 0 !important;
|
||||
margin-top: none !important;
|
||||
}
|
||||
input{
|
||||
font-size: 0.5rem;
|
||||
@ -861,7 +846,7 @@ h1 {
|
||||
}
|
||||
.chaos_connection,
|
||||
.job_situation {
|
||||
flex: 1 0 0;
|
||||
flex: 1 0 0%;
|
||||
padding: 15px;
|
||||
}
|
||||
|
||||
|
||||
@ -43,6 +43,6 @@
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'TheFaq'
|
||||
name: 'Faq'
|
||||
}
|
||||
</script>
|
||||
@ -1,5 +1,32 @@
|
||||
import { unregister } from 'register-service-worker'
|
||||
/* eslint-disable no-console */
|
||||
|
||||
import { register } from 'register-service-worker'
|
||||
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
unregister()
|
||||
register(`${process.env.BASE_URL}service-worker.js`, {
|
||||
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)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user